ChangelogTag: Wed Jul 2 00:23:18 2003 Yamuna Krishnamurthy <yamuna@oomworks.com>

5 files changed, 37 insertions, 22 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d2ecf024d22..4fcd64226dd 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Wed Jul 2 00:23:18 2003  Yamuna Krishnamurthy  <yamuna@oomworks.com>
+
+	* tao/RTScheduling/Distributable_Thread.cpp:
+	* tao/RTScheduling/Request_Interceptor.cpp:		
+	* tao/RTScheduling/Current.h:
+	* tao/RTScheduling/Current.cpp: 
+
+	  Fixed compile errors and warnings in Red Hat 7.1 Explicit
+	  Template  and RH73 GCC32 NoInterceptorsNoExceptions builds.
+	  
 Tue Jul 1 00:27:35 2003  Yamuna Krishnamurthy  <yamuna@oomworks.com>
 
 	* tao/RTScheduling/Current.cpp: 
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index 01ba7bd8d40..7548f1c9b61 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -137,7 +137,7 @@ TAO_RTScheduler_Current::end_scheduling_segment (const char * name
 
 RTScheduling::DistributableThread_ptr 
 TAO_RTScheduler_Current::lookup(const RTScheduling::Current::IdType & id
-				ACE_ENV_ARG_DECL)
+				ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTScheduling::DistributableThread_var DT;
@@ -543,7 +543,6 @@ TAO_RTScheduler_Current_i::spawn (RTScheduling::ThreadAction_ptr start,
 		  TAO_RTScheduler_Current_i (this->orb_,
 					     this->dt_hash_),
 		  0);
-  ACE_CHECK;
 
   new_current->DT (dt.in ());
 
@@ -558,7 +557,6 @@ TAO_RTScheduler_Current_i::spawn (RTScheduling::ThreadAction_ptr start,
 			  sched_param,
 			  implicit_sched_param),
 		  0);
-  ACE_CHECK;
  
   if (dttask->activate_task (base_priority,
 			     stack_size) == -1)
@@ -681,7 +679,7 @@ DTTask::svc (void)
 
 
 RTScheduling::Current::IdType * 
-TAO_RTScheduler_Current_i::id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTScheduler_Current_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   
@@ -691,21 +689,21 @@ TAO_RTScheduler_Current_i::id (ACE_ENV_SINGLE_ARG_DECL)
 
 
 CORBA::Policy_ptr 
-TAO_RTScheduler_Current_i::scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTScheduler_Current_i::scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Policy::_duplicate (this->sched_param_);
 }
 
 CORBA::Policy_ptr 
-TAO_RTScheduler_Current_i::implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTScheduler_Current_i::implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Policy::_duplicate (this->implicit_sched_param_);
 }
 
 RTScheduling::Current::NameList * 
-TAO_RTScheduler_Current_i::current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTScheduler_Current_i::current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTScheduling::Current::NameList* name_list;
diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h
index adc3f86f970..790e15adbc6 100644
--- a/TAO/tao/RTScheduling/Current.h
+++ b/TAO/tao/RTScheduling/Current.h
@@ -90,7 +90,8 @@ public RTScheduling::Current,
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual RTScheduling::DistributableThread_ptr 
-    lookup(const RTScheduling::Current::IdType & id)
+    lookup(const RTScheduling::Current::IdType & id
+	   ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // returns a null reference if
diff --git a/TAO/tao/RTScheduling/Distributable_Thread.cpp b/TAO/tao/RTScheduling/Distributable_Thread.cpp
index d5af3bbf81d..2b6fab0bc4b 100644
--- a/TAO/tao/RTScheduling/Distributable_Thread.cpp
+++ b/TAO/tao/RTScheduling/Distributable_Thread.cpp
@@ -12,14 +12,14 @@ TAO_DistributableThread::~TAO_DistributableThread (void)
 }
 
 void 
-TAO_DistributableThread::cancel (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DistributableThread::cancel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->state_ = RTScheduling::DistributableThread::CANCELLED;
 }
 
 RTScheduling::DistributableThread::DT_State 
-TAO_DistributableThread::state (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DistributableThread::state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->state_;
@@ -41,8 +41,13 @@ TAO_DistributableThread_Factory::create_DT (void)
   ACE_CHECK_RETURN (0);
   
   //RTScheduling::DistributableThread_var dt = RTScheduling::DistributableThread::_narrow (DT
-	//										 ACE_ENV_ARG_PARAMETER);
+  //										 ACE_ENV_ARG_PARAMETER);
   //ACE_CHECK;	
-
+  
   return DT;
 }
+
+
+
+
+
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index 183c940e727..9c431565800 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -110,7 +110,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
 
 void 
 Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
-			       ACE_ENV_ARG_DECL)
+			       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
     ACE_DEBUG ((LM_DEBUG,
@@ -129,7 +129,7 @@ Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
 
 void 
 Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-				   ACE_ENV_ARG_DECL)
+				   ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -195,7 +195,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
   
 void 
 Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-				   ACE_ENV_ARG_DECL)
+				   ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException, 
 		   PortableInterceptor::ForwardRequest))
 {
@@ -214,14 +214,14 @@ Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
 }
 
 char* 
-Client_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL)
+Client_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return  CORBA::string_dup ("RTSchdeuler_Client_Interceptor");
 }
 
 void 
-Client_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL)
+Client_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -236,7 +236,7 @@ Server_Interceptor::Server_Interceptor (TAO_RTScheduler_Current_ptr current)
 
 void 
 Server_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr
-						      ACE_ENV_ARG_DECL)
+						      ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException, 
 		   PortableInterceptor::ForwardRequest))
 {
@@ -369,7 +369,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
   
 void 
 Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-				    ACE_ENV_ARG_DECL)
+				    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   PortableInterceptor::ForwardRequest))
 {
@@ -394,7 +394,7 @@ Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr r
   
 void 
 Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-				ACE_ENV_ARG_DECL)
+				ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   PortableInterceptor::ForwardRequest))
 {
@@ -418,15 +418,16 @@ Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
 }
 
 char* 
-Server_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL)
+Server_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
     return  CORBA::string_dup ("RTSchdeuler_Server_Interceptor");
 }
 
 void 
-Server_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL)
+Server_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
+