ChangeLogTag: Thu Oct 16 15:51:18 2003 Venkita Subramonian <venkita@cs.wustl.edu>

4 files changed, 34 insertions, 12 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 59b0c6e7df8..2eadc1b2687 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Thu Oct 16 15:51:18 2003  Venkita Subramonian  <venkita@cs.wustl.edu>
+
+	* orbsvcs/tests/RTCosScheduling/server.cpp: 
+	* orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp: 
+	* orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h: 
+	  Fixed compile errors for no exceptions builds. 
+	
 Thu Oct 16 11:09:43 2003  Venkita Subramonian  <venkita@cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
index 75b61d00a24..af7810bbec8 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
@@ -150,7 +150,8 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
     PortableServer::POA_ptr parent,
     const char * adapter_name,
     PortableServer::POAManager_ptr a_POAManager,
-    const CORBA::PolicyList & policies)
+    const CORBA::PolicyList & policies
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException
     , PortableServer::POA::AdapterAlreadyExists
     , PortableServer::POA::InvalidPolicy))
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
index 9aed85e986e..1fb36b11e62 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
@@ -239,7 +239,8 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter<
         PortableServer::POA_ptr parent,
         const char * adapter_name,
         PortableServer::POAManager_ptr a_POAManager,
-        const CORBA::PolicyList & policies)
+        const CORBA::PolicyList & policies
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , PortableServer::POA::AdapterAlreadyExists
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
index 63e29b832ab..ea7889f141f 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
@@ -41,10 +41,22 @@ ORB_Thread(CORBA::ORB_var orb) : orb_(orb)
 
 int
 svc(void) {
-    orb_->run();
-    ACE_TRY_CHECK;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
-    exit(0);
+  ACE_TRY
+    {
+      orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "svc");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  exit(0);
+  return 0;
 }
 
 
@@ -102,7 +114,8 @@ parse_args (int argc, char *argv[])
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
-  ACE_TRY_NEW_ENV
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
     {
       if (parse_args (argc, argv) != 0)
         {
@@ -129,7 +142,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
 
       /// Create a manager for the POA
       PortableServer::POAManager_var poa_manager =
-        rootPOA->the_POAManager (ACE_ENV_ARG_PARAMETER);
+        rootPOA->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyList poa_policy_list;
@@ -145,7 +158,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
                          node_,
                          file_,
                          shared_file_,
-                         num_threads_),
+                         num_threads_ ),
                        CORBA::NO_MEMORY());
 
       /// Create the POA so RT Policies are set
@@ -187,18 +200,18 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
       if (use_realtime_)
         {
           /// Schedule the object
-          ACE_TRY_NEW_ENV
+          ACE_TRY_EX(INNER)
             {
               server_sched->schedule_object(testObject.inout(),
-                                            object_);
+                                            object_ ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK_EX(INNER);
             }
           ACE_CATCH(RTCosScheduling::UnknownName, ex)
             {
               ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
                                  "Unknown object passed to schedule_object\n");
             }
-          ACE_ENDTRY
-          ACE_TRY_CHECK;
+          ACE_ENDTRY;
         }