ChangeLogTag: Thu May 2 01:44:35 2002 Irfan Pyarali <irfan@cs.wustl.edu>

5 files changed, 61 insertions, 50 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 3e851038dff..e2ee638c3b7 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,14 @@
+Thu May  2 01:44:35 2002  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* tao/Connection_Handler.cpp (decr_pending_upcalls): Uninlined a
+	  few methods.
+
+	* tao/PortableServer/Default_Servant_Dispatcher.cpp: Changed
+	  ACE_ENV_ARG_DECL to ACE_ENV_ARG_DECL_NOT_USED.
+
+	* tests/RTCORBA/Collocation/Collocation.cpp
+	  (setup_test_parameters): Fixed macro error.
+
 Thu May  2 00:39:48 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* orbsvcs/tests/Security/*/Maefile: Updated dependencies. This
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index 049e2f5ddf9..fe292e370e8 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -154,3 +154,50 @@ TAO_Connection_Handler::transport (TAO_Transport* transport)
 
   this->transport_ = TAO_Transport::_duplicate (transport);
 }
+
+int
+TAO_Connection_Handler::incr_refcount (void)
+{
+  ACE_GUARD_RETURN (ACE_Lock,
+                    ace_mon,
+                    *this->pending_upcall_lock_, -1);
+
+  return ++this->reference_count_;
+}
+
+void
+TAO_Connection_Handler::decr_refcount (void)
+{
+  {
+    ACE_GUARD (ACE_Lock,
+               ace_mon,
+               *this->pending_upcall_lock_);
+
+    --this->reference_count_;
+  }
+
+  if (this->reference_count_ == 0)
+    this->handle_close_i ();
+}
+
+int
+TAO_Connection_Handler::incr_pending_upcalls (void)
+{
+  ACE_GUARD_RETURN (ACE_Lock,
+                    ace_mon,
+                    *this->pending_upcall_lock_, -1);
+
+  return ++this->pending_upcalls_;
+
+
+}
+
+int
+TAO_Connection_Handler::decr_pending_upcalls (void)
+{
+  ACE_GUARD_RETURN (ACE_Lock,
+                    ace_mon,
+                    *this->pending_upcall_lock_, -1);
+
+  return --this->pending_upcalls_;
+}
diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl
index a3fa9a8ec4a..0b8117b0b9c 100644
--- a/TAO/tao/Connection_Handler.inl
+++ b/TAO/tao/Connection_Handler.inl
@@ -44,53 +44,6 @@ TAO_Connection_Handler::is_connect_successful (void) const
 }
 
 ACE_INLINE int
-TAO_Connection_Handler::incr_refcount (void)
-{
-  ACE_GUARD_RETURN (ACE_Lock,
-                    ace_mon,
-                    *this->pending_upcall_lock_, -1);
-
-  return ++this->reference_count_;
-}
-
-ACE_INLINE void
-TAO_Connection_Handler::decr_refcount (void)
-{
-  {
-    ACE_GUARD (ACE_Lock,
-               ace_mon,
-               *this->pending_upcall_lock_);
-
-    --this->reference_count_;
-  }
-
-  if (this->reference_count_ == 0)
-    this->handle_close_i ();
-}
-
-ACE_INLINE int
-TAO_Connection_Handler::incr_pending_upcalls (void)
-{
-  ACE_GUARD_RETURN (ACE_Lock,
-                    ace_mon,
-                    *this->pending_upcall_lock_, -1);
-
-  return ++this->pending_upcalls_;
-
-
-}
-
-ACE_INLINE int
-TAO_Connection_Handler::decr_pending_upcalls (void)
-{
-  ACE_GUARD_RETURN (ACE_Lock,
-                    ace_mon,
-                    *this->pending_upcall_lock_, -1);
-
-  return --this->pending_upcalls_;
-}
-
-ACE_INLINE int
 TAO_Connection_Handler::pending_upcalls (void) const
 {
   return this->pending_upcalls_;
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
index 8dac4b1b381..4e011af125e 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
@@ -44,7 +44,7 @@ TAO_Default_Servant_Dispatcher::pre_invoke_remote_request (TAO_POA &,
                                                            TAO_Service_Context &,
                                                            TAO_Service_Context &,
                                                            TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &
-                                                           ACE_ENV_ARG_DECL)
+                                                           ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -52,7 +52,7 @@ void
 TAO_Default_Servant_Dispatcher::pre_invoke_collocated_request (TAO_POA &,
                                                                CORBA::Short,
                                                                TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &
-                                                               ACE_ENV_ARG_DECL)
+                                                               ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
index d45324bc69a..847a96ffc6c 100644
--- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp
+++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
@@ -26,7 +26,7 @@ void
 setup_test_parameters (Test_Object_And_Servant *test,
                        RTCORBA::Current_ptr current,
                        CORBA::ORB_ptr orb
-                       ACE_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_DECL);
 class test_i :
   public POA_test,
   public PortableServer::RefCountServantBase