Wed Jan 24 12:25:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 15 insertions, 15 deletions

diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h
index cd0047741e9..0514e9b6469 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.h
+++ b/TAO/tao/RTCORBA/Thread_Pool.h
@@ -90,7 +90,7 @@ public:
 
 protected:
   /// Do the real work
-  virtual int run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER);
+  virtual int run (TAO_ORB_Core &orb_core);
 
   /// Lane to which this thread belongs to.
   TAO_Thread_Lane &lane_;
@@ -112,7 +112,7 @@ public:
 
 protected:
   /// Do the real work
-  virtual int run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER);
+  virtual int run (TAO_ORB_Core &orb_core);
 };
 
 class TAO_Thread_Pool;
@@ -136,13 +136,13 @@ public:
                    CORBA::ULong static_threads,
                    CORBA::ULong dynamic_threads,
                    ACE_Time_Value const &dynamic_thread_idle_timeout
-                   ACE_ENV_ARG_DECL);
+                  );
 
   /// Destructor.
   ~TAO_Thread_Lane (void);
 
   /// Open the lane.
-  void open (ACE_ENV_SINGLE_ARG_DECL);
+  void open (void);
 
   /// Finalize the resources.
   void finalize (void);
@@ -198,7 +198,7 @@ public:
 private:
 
   /// Validate lane's priority and map it to a native value.
-  void validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL);
+  void validate_and_map_priority (void);
 
   int create_threads_i (TAO_Thread_Pool_Threads &thread_pool,
                         CORBA::ULong number_of_threads,
@@ -270,7 +270,7 @@ public:
                    CORBA::ULong max_buffered_requests,
                    CORBA::ULong max_request_buffer_size,
                    ACE_Time_Value const &dynamic_thread_idle_timeout
-                   ACE_ENV_ARG_DECL);
+                  );
 
   /// Constructor (for pools with lanes).
   TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
@@ -282,13 +282,13 @@ public:
                    CORBA::ULong max_buffered_requests,
                    CORBA::ULong max_request_buffer_size,
                    ACE_Time_Value const &dynamic_thread_idle_timeout
-                   ACE_ENV_ARG_DECL);
+                  );
 
   /// Destructor.
   ~TAO_Thread_Pool (void);
 
   /// Open the pool.
-  void open (ACE_ENV_SINGLE_ARG_DECL);
+  void open (void);
 
   /// Finalize the resources.
   void finalize (void);
@@ -387,7 +387,7 @@ public:
                      CORBA::ULong max_buffered_requests,
                      CORBA::ULong max_request_buffer_size,
                      ACE_Time_Value const &dynamic_thread_idle_timeout
-                     ACE_ENV_ARG_DECL)
+                     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Create a threadpool with lanes.
@@ -399,16 +399,16 @@ public:
                                 CORBA::ULong max_buffered_requests,
                                 CORBA::ULong max_request_buffer_size,
                                 ACE_Time_Value const &dynamic_thread_idle_timeout
-                                ACE_ENV_ARG_DECL)
+                                )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Destroy a threadpool.
   void destroy_threadpool (RTCORBA::ThreadpoolId threadpool
-                           ACE_ENV_ARG_DECL)
+                           )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTCORBA::RTORB::InvalidThreadpool));
 
-  TAO_Thread_Pool *get_threadpool (RTCORBA::ThreadpoolId thread_pool_id ACE_ENV_ARG_DECL);
+  TAO_Thread_Pool *get_threadpool (RTCORBA::ThreadpoolId thread_pool_id);
 
   /// Collection of thread pools.
   typedef ACE_Hash_Map_Manager<RTCORBA::ThreadpoolId, TAO_Thread_Pool *, ACE_Null_Mutex> THREAD_POOLS;
@@ -434,7 +434,7 @@ private:
                        CORBA::ULong max_buffered_requests,
                        CORBA::ULong max_request_buffer_size,
                        ACE_Time_Value const &dynamic_thread_idle_timeout
-                       ACE_ENV_ARG_DECL)
+                       )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   RTCORBA::ThreadpoolId
@@ -445,12 +445,12 @@ private:
                                   CORBA::ULong max_buffered_requests,
                                   CORBA::ULong max_request_buffer_size,
                                   ACE_Time_Value const &dynamic_thread_idle_timeout
-                                  ACE_ENV_ARG_DECL)
+                                  )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   RTCORBA::ThreadpoolId
   create_threadpool_helper (TAO_Thread_Pool *thread_pool
-                            ACE_ENV_ARG_DECL)
+                            )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // @}