ChangeLogTag:Sun Sep 5 22:46:13 2004 Ossama Othman <ossama@dre.vanderbilt.edu>

5 files changed, 44 insertions, 15 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 381eefe07a3..915dd31ed10 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Sun Sep  5 22:46:13 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* TAO_IDL/be/be_attribute.cpp (be_attribute):
+
+	  TAO_IDL generated attribute methods currently have an exception
+	  specification containing CORBA::SystemException.  Make sure we
+	  generate a "tao/SystemException.h" include directive.
+
+	* examples/RTScheduling/MIF_SchedulingC.h:
+
+	  Removed some lingering "_tao" prefixes in TAO::Objref_Traits<>
+	  traits templates.  Fixes compile-time errors.
+
+	* orbsvcs/tests/IOR_MCast/server.cpp:
+	* orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp:
+
+	  Fixed compile-time errors due to missing #include directives now
+	  made necessary by header reductions performed over the last few
+	  days.
+
 Sun Sep  5 09:42:34 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* orbsvcs/orbsvcs/Time_Utilities.i:
diff --git a/TAO/TAO_IDL/be/be_attribute.cpp b/TAO/TAO_IDL/be/be_attribute.cpp
index 652a768516c..b00d7d35941 100644
--- a/TAO/TAO_IDL/be/be_attribute.cpp
+++ b/TAO/TAO_IDL/be/be_attribute.cpp
@@ -25,8 +25,8 @@
 
 #include "global_extern.h"
 
-ACE_RCSID (be, 
-           be_attribute, 
+ACE_RCSID (be,
+           be_attribute,
            "$Id$")
 
 be_attribute::be_attribute (void)
@@ -77,9 +77,15 @@ be_attribute::be_attribute (idl_bool ro,
            be_operation_default_strategy (0));
   this->set_strategy_ = bods;
 
+  // TAO_IDL generated attribute methods currently have an exception
+  // specification containing CORBA::SystemException.  Make sure we
+  // generate a "tao/SystemException.h" include directive.
+  ACE_SET_BITS (idl_global->decls_seen_info_,
+                idl_global->decls_seen_masks.operation_seen_);
+
   if (!this->imported () && !this->is_local ())
     {
-      // For the return types of the two operations 
+      // For the return types of the two operations
       // generated from this attribute.
       this->set_arg_seen_bit (be_type::narrow_from_decl (ft));
       ACE_SET_BITS (idl_global->decls_seen_info_,
diff --git a/TAO/examples/RTScheduling/MIF_SchedulingC.h b/TAO/examples/RTScheduling/MIF_SchedulingC.h
index e761017eb5f..fd67d8171a8 100644
--- a/TAO/examples/RTScheduling/MIF_SchedulingC.h
+++ b/TAO/examples/RTScheduling/MIF_SchedulingC.h
@@ -320,14 +320,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct  Objref_Traits<MIF_Scheduling::MIF_Scheduler>
   {
-    static MIF_Scheduling::MIF_Scheduler_ptr tao_duplicate (
+    static MIF_Scheduling::MIF_Scheduler_ptr duplicate (
         MIF_Scheduling::MIF_Scheduler_ptr
       );
-    static void tao_release (
+    static void release (
         MIF_Scheduling::MIF_Scheduler_ptr
       );
-    static MIF_Scheduling::MIF_Scheduler_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
+    static MIF_Scheduling::MIF_Scheduler_ptr nil (void);
+    static CORBA::Boolean marshal (
         MIF_Scheduling::MIF_Scheduler_ptr p,
         TAO_OutputCDR & cdr
       );
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
index 829cb75d232..be8c6ab97c8 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
@@ -9,18 +9,17 @@ int main (int argc, char *argv[])
     {
       Server_i svr_i;
 
-      int init_result;
-
-      init_result = svr_i.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      const int init_result = svr_i.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (init_result != 0)
         return 1;
 
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  ACE_CATCHANY
     {
-            ACE_PRINT_EXCEPTION (ex, "CORBA exception raised in server!");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "CORBA exception raised in server!");
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
index ceb937af83f..f4f3d3311c2 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
+++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
@@ -22,16 +22,20 @@
 //
 // ============================================================================
 
+#include "tao/ORB.h"
+#include "tao/Object.h"
+#include "tao/SystemException.h"
+
 #include "ace/Service_Config.h"
 #include "ace/Log_Msg.h"
 #include "ace/CORBA_macros.h"
 
-#include "tao/ORB.h"
 
-ACE_RCSID (tests_svc_loader, 
-           tests_svc_loader, 
+ACE_RCSID (tests_svc_loader,
+           tests_svc_loader,
            "$Id$")
 
+
 int main (int argc, char *argv [])
 {