ChangeLogTag:Mon Dec 22 19:08:55 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu>

5 files changed, 44 insertions, 64 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
index 5de4a12dfc8..89597aaad86 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ b/TAO/orbsvcs/orbsvcs/Makefile
@@ -68,6 +68,7 @@ RtecEventCommC.cpp RtecEventCommS.cpp RtecEventCommC.h RtecEventCommS.h: RtecEve
 RtecEventChannelAdminC.cpp RtecEventChannelAdminS.cpp RtecEventChannelAdminC.h RtecEventChannelAdminS.h: RtecEventChannelAdmin.idl
 	$(TAO_ROOT)/TAO_IDL/tao_idl $^
 
+clean:
 	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
  
 realclean: clean
diff --git a/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl b/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl
index ec0147abbb9..9ba626ba73e 100644
--- a/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl
@@ -6,10 +6,8 @@
 
 module RtecEventChannelAdmin {
 
-  exception AlreadyConnected {
-  };
-  exception TypeError {
-  };
+  exception AlreadyConnected {};
+  exception TypeError {};
 
   struct Dependency {
     RtecEventComm::Event event_;
@@ -55,31 +53,12 @@ module RtecEventChannelAdmin {
   };
 
   interface EventChannel {
-    exception SYNCHRONIZATION_ERROR {
-      long minor;
-      long status;
-      string name;
-    };
-    exception QOS_ERROR {
-      long minor;
-      long status;
-      string name;
-    };
-    exception SUBSCRIPTION_ERROR {
-      long minor;
-      long status;
-      string name;
-    };
-    exception CORRELATION_ERROR {
-      long minor;
-      long status;
-      string name;
-    };
-    exception DISPATCH_ERROR {
-      long minor;
-      long status;
-      string name;
-    };
+    exception SYNCHRONIZATION_ERROR {};
+    exception QOS_ERROR {};
+    exception SUBSCRIPTION_ERROR {};
+    exception CORRELATION_ERROR {};
+    exception DISPATCH_ERROR {};
+
     ConsumerAdmin for_consumers();
     SupplierAdmin for_suppliers();
 
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index 315117e5610..1f45181d12a 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -22,7 +22,7 @@ ACE_Runtime_Scheduler (int entry_count,
 RtecScheduler::handle_t
 ACE_Runtime_Scheduler::create (const char * entry_point,
 			       CORBA::Environment &_env)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
 		      RtecScheduler::DUPLICATE_NAME))
 {
   // Just make sure its there and returns its handle (position).
@@ -41,7 +41,7 @@ ACE_Runtime_Scheduler::create (const char * entry_point,
 RtecScheduler::handle_t
 ACE_Runtime_Scheduler::lookup (const char * entry_point,
 			       CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+    TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return create (entry_point, _env);
 }
@@ -49,12 +49,12 @@ ACE_Runtime_Scheduler::lookup (const char * entry_point,
 RtecScheduler::RT_Info*
 ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle,
 			    CORBA::Environment &_env)
-     ACE_THROW_SPEC((CORBA::SystemException,
+     TAO_THROW_SPEC((CORBA::SystemException,
 		     RtecScheduler::UNKNOWN_TASK))
 {
   if (handle < 0 || handle > entry_count_)
     {
-      ACE_THROW_RETURN (RtecScheduler::UNKNOWN_TASK(), 0);
+      TAO_THROW_RETURN (RtecScheduler::UNKNOWN_TASK(), 0);
     }
   return rt_info_[handle];
 }
@@ -68,14 +68,14 @@ void ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle,
 				 RtecScheduler::Quantum quantum,
 				 CORBA::Long threads,
 				 CORBA::Environment &_env)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
 		      RtecScheduler::UNKNOWN_TASK))
 {
   // We compare the values with the ones stored and print a message on
   // any differences.
   if (handle < 0 || handle > entry_count_)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK);
+      TAO_THROW (RtecScheduler::UNKNOWN_TASK);
       return;
     }
   if (rt_info_[handle]->worst_case_execution_time != time
@@ -98,13 +98,13 @@ void ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle,
 				      RtecScheduler::Sub_Priority& subpriority,
 				      RtecScheduler::Preemption_Priority& p_priority,
 				      CORBA::Environment &_env)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
 		      RtecScheduler::UNKNOWN_TASK,
 		      RtecScheduler::NOT_SCHEDULED))
 {
   if (handle < 0 || handle > entry_count_)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK());
+      TAO_THROW (RtecScheduler::UNKNOWN_TASK());
       return;
     }
   priority = rt_info_[handle]->priority;
@@ -117,7 +117,7 @@ void ACE_Runtime_Scheduler::entry_point_priority (const char * entry_point,
 						  RtecScheduler::Sub_Priority& subpriority,
 						  RtecScheduler::Preemption_Priority& p_priority,
 						  CORBA::Environment &_env)
-     ACE_THROW_SPEC((CORBA::SystemException,
+     TAO_THROW_SPEC((CORBA::SystemException,
 		     RtecScheduler::UNKNOWN_TASK,
 		     RtecScheduler::NOT_SCHEDULED))
 {
@@ -134,12 +134,12 @@ void ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle,
 					    RtecScheduler::handle_t dependency,
 					    CORBA::Long number_of_calls,
 					    CORBA::Environment &_env)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
 		      RtecScheduler::UNKNOWN_TASK))
 {
   if (handle < 0 || handle > entry_count_)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK);
+      TAO_THROW (RtecScheduler::UNKNOWN_TASK);
       return;
     }
   // Just check that the information is consistent.
@@ -160,7 +160,7 @@ void ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
 						CORBA::Long maximum_priority,
 						RtecScheduler::RT_Info_Set_out infos,
 						CORBA::Environment &_env)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
 		      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
 		      RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
 		      RtecScheduler::TASK_COUNT_MISMATCH))
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
index e77513041dd..698393880a8 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -29,15 +29,15 @@ public:
 
   virtual RtecScheduler::handle_t create (const char * entry_point,
 					  CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME));
+    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME));
 
   virtual RtecScheduler::handle_t lookup (const char * entry_point,
 					  CORBA::Environment &_env)
-    ACE_THROW_SPEC((CORBA::SystemException));
+    TAO_THROW_SPEC((CORBA::SystemException));
 
   virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle,
 				       CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
+    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
 
   virtual void set (RtecScheduler::handle_t handle,
 		    RtecScheduler::Time time,
@@ -48,14 +48,14 @@ public:
 		    RtecScheduler::Quantum quantum,
 		    CORBA::Long threads,
 		    CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
+    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
 
   virtual void priority (RtecScheduler::handle_t handle,
 			 RtecScheduler::OS_Priority& priority,
 			 RtecScheduler::Sub_Priority& subpriority,
 			 RtecScheduler::Preemption_Priority& p_priority,
 			 CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
 		     RtecScheduler::UNKNOWN_TASK,
 		     RtecScheduler::NOT_SCHEDULED));
            
@@ -64,7 +64,7 @@ public:
 				     RtecScheduler::Sub_Priority& subpriority,
 				     RtecScheduler::Preemption_Priority& p_priority,
 				     CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
 		     RtecScheduler::UNKNOWN_TASK,
 		     RtecScheduler::NOT_SCHEDULED));
 
@@ -72,14 +72,14 @@ public:
 			       RtecScheduler::handle_t dependency,
 			       CORBA::Long number_of_calls,
 			       CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
 		     RtecScheduler::UNKNOWN_TASK));
 
   virtual void compute_scheduling (CORBA::Long minimum_priority,
 				   CORBA::Long maximum_priority,
 				   RtecScheduler::RT_Info_Set_out infos,
 				   CORBA::Environment &_env)
-    ACE_THROW_SPEC((CORBA::SystemException,
+    TAO_THROW_SPEC((CORBA::SystemException,
 		    RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
 		    RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
 		    RtecScheduler::TASK_COUNT_MISMATCH));
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 850b1a159d9..681470630e8 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -97,30 +97,30 @@ ACE_Scheduler_Factory::use_config (CosNaming::NamingContext_ptr naming)
       return 0;
     }
 
-  ACE_TRY
+  TAO_TRY
     {
       CosNaming::Name schedule_name (1);
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
       schedule_name.length (1);
       CORBA::Object_ptr objref =
-	naming->resolve (schedule_name, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
+	naming->resolve (schedule_name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       server_ =
-	RtecScheduler::Scheduler::_narrow(objref, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
+	RtecScheduler::Scheduler::_narrow(objref, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       RtecScheduler::Scheduler::_duplicate (server_);
-      ACE_CHECK_ENV;
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       server_ = 0;
       ACE_ERROR_RETURN ((LM_ERROR,
 			 "ACE_Scheduler_Factory::use_context - "
 			 " exception while resolving server\n"), -1);
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
@@ -134,27 +134,27 @@ ACE_Scheduler_Factory::use_config (CORBA::ORB_ptr orb)
       return 0;
     }
 
-  ACE_TRY
+  TAO_TRY
     {
       CORBA::Object_ptr objref =
 	orb->resolve_initial_references ("ScheduleService");
-      ACE_CHECK_ENV;
+      TAO_CHECK_ENV;
 
       server_ =
-	RtecScheduler::Scheduler::_narrow(objref, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
+	RtecScheduler::Scheduler::_narrow(objref, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       RtecScheduler::Scheduler::_duplicate (server_);
-      ACE_CHECK_ENV;
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       server_ = 0;
       ACE_ERROR_RETURN ((LM_ERROR,
 			 "ACE_Scheduler_Factory::use_context - "
 			 " exception while resolving server\n"), -1);
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }