ChangeLogTag: Fri Dec 10 00:59:46 1999 Irfan Pyarali <irfan@cs.wustl.edu>

13 files changed, 327 insertions, 315 deletions

diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp
index 2fbed6ce57d..70b2bbb500d 100644
--- a/TAO/tao/Buffering_Constraint_Policy.cpp
+++ b/TAO/tao/Buffering_Constraint_Policy.cpp
@@ -25,18 +25,6 @@ TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO_Buff
 {
 }
 
-TAO::BufferingConstraint
-TAO_Buffering_Constraint_Policy::buffering_constraint (CORBA::Environment &)
-{
-  return this->buffering_constraint_;
-}
-
-TAO::BufferingConstraint
-TAO_Buffering_Constraint_Policy::buffering_constraint (void)
-{
-  return this->buffering_constraint_;
-}
-
 CORBA::PolicyType
 TAO_Buffering_Constraint_Policy::policy_type (CORBA_Environment &)
 {
diff --git a/TAO/tao/Buffering_Constraint_Policy.i b/TAO/tao/Buffering_Constraint_Policy.i
index cfa1da318d3..6a7f3a8df4e 100644
--- a/TAO/tao/Buffering_Constraint_Policy.i
+++ b/TAO/tao/Buffering_Constraint_Policy.i
@@ -1 +1,13 @@
 // $Id$
+
+ACE_INLINE TAO::BufferingConstraint
+TAO_Buffering_Constraint_Policy::buffering_constraint (CORBA::Environment &)
+{
+  return this->buffering_constraint_;
+}
+
+ACE_INLINE TAO::BufferingConstraint
+TAO_Buffering_Constraint_Policy::buffering_constraint (void)
+{
+  return this->buffering_constraint_;
+}
diff --git a/TAO/tao/MessagingS.cpp b/TAO/tao/MessagingS.cpp
index b17b9dfbe27..a0583de9c08 100644
--- a/TAO/tao/MessagingS.cpp
+++ b/TAO/tao/MessagingS.cpp
@@ -220,6 +220,11 @@ Messaging::SyncScope POA_Messaging::_tao_collocated_SyncScopePolicy::synchroniza
                                           );
 }
 
+Messaging::SyncScope POA_Messaging::_tao_collocated_SyncScopePolicy::synchronization  (void)
+{
+  return this->servant_->synchronization ();
+}
+
 
 Messaging::SyncScopePolicy*
 POA_Messaging::SyncScopePolicy::_this (CORBA_Environment &ACE_TRY_ENV)
diff --git a/TAO/tao/MessagingS.h b/TAO/tao/MessagingS.h
index 69e4e0886bc..8cc3ceb4e91 100644
--- a/TAO/tao/MessagingS.h
+++ b/TAO/tao/MessagingS.h
@@ -204,10 +204,8 @@ private:
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual Messaging::SyncScope synchronization (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
+    virtual Messaging::SyncScope synchronization (CORBA::Environment &ACE_TRY_ENV);
+    virtual Messaging::SyncScope synchronization (void);
 
   private:
     SyncScopePolicy_ptr servant_;
@@ -247,10 +245,8 @@ private:
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    Messaging::SyncScope synchronization (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
+    Messaging::SyncScope synchronization (CORBA::Environment &ACE_TRY_ENV);
+    Messaging::SyncScope synchronization (void);
     CORBA::PolicyType policy_type (
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
diff --git a/TAO/tao/MessagingS_T.i b/TAO/tao/MessagingS_T.i
index fd4a7cf99c9..4af35c3c33d 100644
--- a/TAO/tao/MessagingS_T.i
+++ b/TAO/tao/MessagingS_T.i
@@ -12,30 +12,30 @@
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_Messaging::RebindPolicy_tie<T>::RebindPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RebindPolicy_tie<T>::RebindPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RebindPolicy_tie<T>::RebindPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RebindPolicy_tie<T>::RebindPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -123,30 +123,30 @@ void POA_Messaging::RebindPolicy_tie<T>::destroy  (
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_Messaging::SyncScopePolicy_tie<T>::SyncScopePolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::SyncScopePolicy_tie<T>::SyncScopePolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::SyncScopePolicy_tie<T>::SyncScopePolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::SyncScopePolicy_tie<T>::SyncScopePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -200,6 +200,12 @@ Messaging::SyncScope POA_Messaging::SyncScopePolicy_tie<T>::synchronization  (
 }
 
 template <class T> ACE_INLINE
+Messaging::SyncScope POA_Messaging::SyncScopePolicy_tie<T>::synchronization  (void)
+{
+  return this->ptr_->synchronization ();
+}
+
+template <class T> ACE_INLINE
 CORBA::PolicyType POA_Messaging::SyncScopePolicy_tie<T>::policy_type  (
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -234,30 +240,30 @@ void POA_Messaging::SyncScopePolicy_tie<T>::destroy  (
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_Messaging::RequestPriorityPolicy_tie<T>::RequestPriorityPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RequestPriorityPolicy_tie<T>::RequestPriorityPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RequestPriorityPolicy_tie<T>::RequestPriorityPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RequestPriorityPolicy_tie<T>::RequestPriorityPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -345,30 +351,30 @@ void POA_Messaging::RequestPriorityPolicy_tie<T>::destroy  (
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_Messaging::ReplyPriorityPolicy_tie<T>::ReplyPriorityPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyPriorityPolicy_tie<T>::ReplyPriorityPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyPriorityPolicy_tie<T>::ReplyPriorityPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyPriorityPolicy_tie<T>::ReplyPriorityPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -456,30 +462,30 @@ void POA_Messaging::ReplyPriorityPolicy_tie<T>::destroy  (
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_Messaging::RequestStartTimePolicy_tie<T>::RequestStartTimePolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RequestStartTimePolicy_tie<T>::RequestStartTimePolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RequestStartTimePolicy_tie<T>::RequestStartTimePolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RequestStartTimePolicy_tie<T>::RequestStartTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -567,30 +573,30 @@ void POA_Messaging::RequestStartTimePolicy_tie<T>::destroy  (
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_Messaging::RequestEndTimePolicy_tie<T>::RequestEndTimePolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RequestEndTimePolicy_tie<T>::RequestEndTimePolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RequestEndTimePolicy_tie<T>::RequestEndTimePolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RequestEndTimePolicy_tie<T>::RequestEndTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -678,30 +684,30 @@ void POA_Messaging::RequestEndTimePolicy_tie<T>::destroy  (
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_Messaging::ReplyStartTimePolicy_tie<T>::ReplyStartTimePolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyStartTimePolicy_tie<T>::ReplyStartTimePolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyStartTimePolicy_tie<T>::ReplyStartTimePolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyStartTimePolicy_tie<T>::ReplyStartTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -789,30 +795,30 @@ void POA_Messaging::ReplyStartTimePolicy_tie<T>::destroy  (
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_Messaging::ReplyEndTimePolicy_tie<T>::ReplyEndTimePolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyEndTimePolicy_tie<T>::ReplyEndTimePolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyEndTimePolicy_tie<T>::ReplyEndTimePolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyEndTimePolicy_tie<T>::ReplyEndTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -900,30 +906,30 @@ void POA_Messaging::ReplyEndTimePolicy_tie<T>::destroy  (
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::RelativeRequestTimeoutPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::RelativeRequestTimeoutPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::RelativeRequestTimeoutPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::RelativeRequestTimeoutPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1011,30 +1017,30 @@ void POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::destroy  (
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::RelativeRoundtripTimeoutPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::RelativeRoundtripTimeoutPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::RelativeRoundtripTimeoutPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::RelativeRoundtripTimeoutPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1122,30 +1128,30 @@ void POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::destroy  (
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_Messaging::RoutingPolicy_tie<T>::RoutingPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RoutingPolicy_tie<T>::RoutingPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RoutingPolicy_tie<T>::RoutingPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::RoutingPolicy_tie<T>::RoutingPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1233,30 +1239,30 @@ void POA_Messaging::RoutingPolicy_tie<T>::destroy  (
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_Messaging::MaxHopsPolicy_tie<T>::MaxHopsPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::MaxHopsPolicy_tie<T>::MaxHopsPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::MaxHopsPolicy_tie<T>::MaxHopsPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::MaxHopsPolicy_tie<T>::MaxHopsPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1344,30 +1350,30 @@ void POA_Messaging::MaxHopsPolicy_tie<T>::destroy  (
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_Messaging::QueueOrderPolicy_tie<T>::QueueOrderPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::QueueOrderPolicy_tie<T>::QueueOrderPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::QueueOrderPolicy_tie<T>::QueueOrderPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::QueueOrderPolicy_tie<T>::QueueOrderPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1456,30 +1462,30 @@ void POA_Messaging::QueueOrderPolicy_tie<T>::destroy  (
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1527,30 +1533,30 @@ POA_Messaging::ReplyHandler_tie<T>::_is_owner (CORBA::Boolean b)
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_Messaging::Poller_tie<T>::Poller_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::Poller_tie<T>::Poller_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::Poller_tie<T>::Poller_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::Poller_tie<T>::Poller_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
diff --git a/TAO/tao/Messaging_Policy_i.cpp b/TAO/tao/Messaging_Policy_i.cpp
index db171ad49b6..206c309ce1c 100644
--- a/TAO/tao/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging_Policy_i.cpp
@@ -144,18 +144,6 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs)
 {
 }
 
-Messaging::SyncScope
-TAO_Sync_Scope_Policy::synchronization (CORBA::Environment &)
-{
-  return this->synchronization_;
-}
-
-Messaging::SyncScope
-TAO_Sync_Scope_Policy::synchronization (void)
-{
-  return this->synchronization_;
-}
-
 CORBA::PolicyType
 TAO_Sync_Scope_Policy::policy_type (CORBA_Environment &)
 {
diff --git a/TAO/tao/Messaging_Policy_i.i b/TAO/tao/Messaging_Policy_i.i
index cfa1da318d3..dc9fb6240c0 100644
--- a/TAO/tao/Messaging_Policy_i.i
+++ b/TAO/tao/Messaging_Policy_i.i
@@ -1 +1,13 @@
 // $Id$
+
+ACE_INLINE Messaging::SyncScope
+TAO_Sync_Scope_Policy::synchronization (CORBA::Environment &)
+{
+  return this->synchronization_;
+}
+
+ACE_INLINE Messaging::SyncScope
+TAO_Sync_Scope_Policy::synchronization (void)
+{
+  return this->synchronization_;
+}
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index b5325bc5271..49fdbf22c7e 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1769,30 +1769,6 @@ TAO_ORB_Core::open (CORBA::Environment &ACE_TRY_ENV)
 
 // ****************************************************************
 
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-TAO_None_Sync_Strategy &
-TAO_ORB_Core::none_sync_strategy (void)
-{
-  return *this->none_sync_strategy_;
-}
-
-TAO_Flush_Sync_Strategy &
-TAO_ORB_Core::flush_sync_strategy (void)
-{
-  return *this->flush_sync_strategy_;
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-TAO_Transport_Sync_Strategy &
-TAO_ORB_Core::transport_sync_strategy (void)
-{
-  return *this->transport_sync_strategy_;
-}
-
-// ****************************************************************
-
 ACE_Allocator*
 TAO_ORB_Core::input_cdr_dblock_allocator_i (TAO_ORB_Core_TSS_Resources *tss)
 {
@@ -2028,42 +2004,6 @@ TAO_ORB_Core::reactor (TAO_Acceptor *acceptor)
   return this->reactor_;
 }
 
-TAO_POA_Current &
-TAO_ORB_Core::poa_current (void) const
-{
-  return *this->poa_current_;
-}
-
-CORBA_Environment*
-TAO_ORB_Core::default_environment (void) const
-{
-  return TAO_TSS_RESOURCES::instance ()->default_environment_;
-}
-
-void
-TAO_ORB_Core::default_environment (CORBA_Environment *env)
-{
-  TAO_TSS_RESOURCES::instance ()->default_environment_ = env;
-}
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-TAO_Policy_Current &
-TAO_ORB_Core::policy_current (void)
-{
-  return *this->policy_current_;
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-#if defined (TAO_HAS_RT_CORBA)
-TAO_Priority_Mapping *
-TAO_ORB_Core::priority_mapping (void)
-{
-  return this->priority_mapping_;
-}
-#endif /* TAO_HAS_RT_CORBA */
-
 int
 TAO_ORB_Core::get_thread_priority (CORBA::Short &priority)
 {
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index 02b51715b6c..9d2efc3f344 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -194,6 +194,67 @@ TAO_ORB_Core::orbid (void) const
   return this->orbid_;
 }
 
+// ****************************************************************
+
+#if defined (TAO_HAS_CORBA_MESSAGING)
+
+ACE_INLINE TAO_None_Sync_Strategy &
+TAO_ORB_Core::none_sync_strategy (void)
+{
+  return *this->none_sync_strategy_;
+}
+
+ACE_INLINE TAO_Flush_Sync_Strategy &
+TAO_ORB_Core::flush_sync_strategy (void)
+{
+  return *this->flush_sync_strategy_;
+}
+
+#endif /* TAO_HAS_CORBA_MESSAGING */
+
+ACE_INLINE TAO_Transport_Sync_Strategy &
+TAO_ORB_Core::transport_sync_strategy (void)
+{
+  return *this->transport_sync_strategy_;
+}
+
+#if defined (TAO_HAS_CORBA_MESSAGING)
+
+ACE_INLINE TAO_Policy_Current &
+TAO_ORB_Core::policy_current (void)
+{
+  return *this->policy_current_;
+}
+
+#endif /* TAO_HAS_CORBA_MESSAGING */
+
+#if defined (TAO_HAS_RT_CORBA)
+
+ACE_INLINE TAO_Priority_Mapping *
+TAO_ORB_Core::priority_mapping (void)
+{
+  return this->priority_mapping_;
+}
+
+#endif /* TAO_HAS_RT_CORBA */
+
+ACE_INLINE TAO_POA_Current &
+TAO_ORB_Core::poa_current (void) const
+{
+  return *this->poa_current_;
+}
+
+ACE_INLINE CORBA_Environment *
+TAO_ORB_Core::default_environment (void) const
+{
+  return TAO_TSS_RESOURCES::instance ()->default_environment_;
+}
+
+ACE_INLINE void
+TAO_ORB_Core::default_environment (CORBA_Environment *env)
+{
+  TAO_TSS_RESOURCES::instance ()->default_environment_ = env;
+}
 
 // ****************************************************************
 
diff --git a/TAO/tao/Pluggable.cpp b/TAO/tao/Pluggable.cpp
index aa875436e92..0f3156ec74d 100644
--- a/TAO/tao/Pluggable.cpp
+++ b/TAO/tao/Pluggable.cpp
@@ -105,32 +105,6 @@ TAO_Transport::send_buffered_messages (const ACE_Time_Value *max_wait_time)
 }
 
 void
-TAO_Transport::dequeue_head (void)
-{
-  // Remove from the head of the queue.
-  ACE_Message_Block *message_block = 0;
-  int result = this->buffering_queue_->dequeue_head (message_block);
-
-  // @@ What to do here on failures?
-  ACE_ASSERT (result != -1);
-  ACE_UNUSED_ARG (result);
-
-  // Release the memory.
-  message_block->release ();
-}
-
-void
-TAO_Transport::dequeue_all (void)
-{
-  // Flush all queued messages.
-  if (this->buffering_queue_)
-    {
-      while (!this->buffering_queue_->is_empty ())
-        this->dequeue_head ();
-    }
-}
-
-void
 TAO_Transport::reset_queued_message (ACE_Message_Block *message_block,
                                      size_t bytes_delivered)
 {
@@ -238,19 +212,6 @@ TAO_Transport::start_locate (TAO_ORB_Core *,
   ACE_THROW (CORBA::INTERNAL ());
 }
 
-TAO_Transport_Buffering_Queue &
-TAO_Transport::buffering_queue (void)
-{
-  if (this->buffering_queue_ == 0)
-    {
-      // Infinite high water mark: ACE_UINT32_MAX.
-      this->buffering_queue_ =
-        new TAO_Transport_Buffering_Queue (ACE_UINT32_MAX);
-    }
-
-  return *this->buffering_queue_;
-}
-
 // *********************************************************************
 
 // Connector
diff --git a/TAO/tao/Pluggable.i b/TAO/tao/Pluggable.i
index efa8d1713b4..8a67c8aed7a 100644
--- a/TAO/tao/Pluggable.i
+++ b/TAO/tao/Pluggable.i
@@ -52,6 +52,45 @@ TAO_Transport::buffering_timeout_value (const ACE_Time_Value &new_value)
   this->buffering_timeout_value_ = new_value;
 }
 
+ACE_INLINE TAO_Transport_Buffering_Queue &
+TAO_Transport::buffering_queue (void)
+{
+  if (this->buffering_queue_ == 0)
+    {
+      // Infinite high water mark: ACE_UINT32_MAX.
+      this->buffering_queue_ =
+        new TAO_Transport_Buffering_Queue (ACE_UINT32_MAX);
+    }
+
+  return *this->buffering_queue_;
+}
+
+ACE_INLINE void
+TAO_Transport::dequeue_head (void)
+{
+  // Remove from the head of the queue.
+  ACE_Message_Block *message_block = 0;
+  int result = this->buffering_queue_->dequeue_head (message_block);
+
+  // @@ What to do here on failures?
+  ACE_ASSERT (result != -1);
+  ACE_UNUSED_ARG (result);
+
+  // Release the memory.
+  message_block->release ();
+}
+
+ACE_INLINE void
+TAO_Transport::dequeue_all (void)
+{
+  // Flush all queued messages.
+  if (this->buffering_queue_)
+    {
+      while (!this->buffering_queue_->is_empty ())
+        this->dequeue_head ();
+    }
+}
+
 // ****************************************************************
 
 ACE_INLINE CORBA::ULong
diff --git a/TAO/tao/TAOS.cpp b/TAO/tao/TAOS.cpp
index 24166d46aec..f38acff40ff 100644
--- a/TAO/tao/TAOS.cpp
+++ b/TAO/tao/TAOS.cpp
@@ -219,4 +219,10 @@ TAO::BufferingConstraint POA_TAO::_tao_direct_collocated_BufferingConstraintPoli
 
 }
 
+TAO::BufferingConstraint POA_TAO::_tao_direct_collocated_BufferingConstraintPolicy::buffering_constraint  (void)
+{
+  return this->servant_->buffering_constraint ();
+
+}
+
 #endif /* TAO_HAS_CORBA_MESSAGING */
diff --git a/TAO/tao/TAOS.h b/TAO/tao/TAOS.h
index 178421db89b..987a93955c2 100644
--- a/TAO/tao/TAOS.h
+++ b/TAO/tao/TAOS.h
@@ -166,10 +166,8 @@ TAO_NAMESPACE  POA_TAO
         CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
       );
 
-        virtual TAO::BufferingConstraint buffering_constraint (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+    virtual TAO::BufferingConstraint buffering_constraint (CORBA::Environment &ACE_TRY_ENV);
+    virtual TAO::BufferingConstraint buffering_constraint (void);
 
 
   private: