*** empty log message ***

9 files changed, 164 insertions, 54 deletions

diff --git a/TAO/tao/Acceptor_Registry.i b/TAO/tao/Acceptor_Registry.i
index eb5e463892b..4a98e902fc1 100644
--- a/TAO/tao/Acceptor_Registry.i
+++ b/TAO/tao/Acceptor_Registry.i
@@ -1,14 +1,14 @@
 // -*- C++ -*-
 // $Id$
 
-ACE_INLINE TAO_AcceptorSetItor
+ACE_INLINE TAO_AcceptorSetIterator
 TAO_Acceptor_Registry::begin (void)
 {
-  return this->acceptors_.begin ();
+  return this->acceptors_;
 }
 
-ACE_INLINE TAO_AcceptorSetItor
+ACE_INLINE TAO_AcceptorSetIterator
 TAO_Acceptor_Registry::end (void)
 {
-  return this->acceptors_.end ();
+  return this->acceptors_ + this->size_;
 }
diff --git a/TAO/tao/Asynch_Invocation.i b/TAO/tao/Asynch_Invocation.i
index a44dc1efc70..f00ce65d269 100644
--- a/TAO/tao/Asynch_Invocation.i
+++ b/TAO/tao/Asynch_Invocation.i
@@ -3,9 +3,9 @@
 // $Id$
 //
 
-#if defined (TAO_HAS_CORBA_MESSAGING)
+#if (TAO_HAS_CORBA_MESSAGING == 1)
 
-#  if defined (TAO_HAS_AMI_CALLBACK) || (TAO_HAS_AMI_POLLER)
+#  if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
 
 ACE_INLINE
 TAO_GIOP_Twoway_Asynch_Invocation::
@@ -14,24 +14,24 @@ TAO_GIOP_Twoway_Asynch_Invocation (TAO_Stub *stub,
                                    TAO_ORB_Core *orb_core,
                                    const TAO_Reply_Handler_Skeleton &reply_handler_skel,
                                    Messaging::ReplyHandler_ptr reply_handler_ptr)
-  : TAO_GIOP_Invocation (stub, 
-                         operation, 
-			 orb_core),
+  : TAO_GIOP_Invocation (stub,
+                         operation,
+                         orb_core),
     rd_ (0)
 {
   // New reply dispatcher on the heap, because
-  // we will go out of scope and hand over the 
+  // we will go out of scope and hand over the
   // reply dispatcher to the ORB.
-  // So this->rd_ is 0, because we do not need to 
+  // So this->rd_ is 0, because we do not need to
   // hold a pointer to it.
   ACE_NEW (rd_,
            TAO_Asynch_Reply_Dispatcher (reply_handler_skel,
                                         reply_handler_ptr));
 }
 
-#  endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
+#  endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
 
-#endif /* TAO_HAS_CORBA_MESSAGING */
+#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
 //****************************************************************************
 
@@ -42,19 +42,18 @@ TAO_GIOP_DII_Deferred_Invocation::
 TAO_GIOP_DII_Deferred_Invocation (TAO_Stub *stub,
                                   TAO_ORB_Core *orb_core,
                                   const CORBA::Request_ptr req)
-  : TAO_GIOP_Invocation (stub, 
-                         req->operation (), 
-			 orb_core),
+  : TAO_GIOP_Invocation (stub,
+                         req->operation (),
+                         orb_core),
     rd_ (0)
 {
   // New reply dispatcher on the heap, because
-  // we will go out of scope and hand over the 
+  // we will go out of scope and hand over the
   // reply dispatcher to the ORB.
-  // So this->rd_ is 0, because we do not need to 
+  // So this->rd_ is 0, because we do not need to
   // hold a pointer to it.
   ACE_NEW (rd_,
            TAO_DII_Deferred_Reply_Dispatcher (req));
 }
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
-
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/MessagingC.i b/TAO/tao/MessagingC.i
index c950e0ee245..8678acf74b9 100644
--- a/TAO/tao/MessagingC.i
+++ b/TAO/tao/MessagingC.i
@@ -3020,7 +3020,7 @@ Messaging::PolicyValueSeq_out::operator[] (CORBA::ULong slot)
 }
 
 
-#if defined (TAO_HAS_AMI_CALLBACK)
+#if (TAO_HAS_AMI_CALLBACK == 1)
 
 // *************************************************************
 // Inline operations for class Messaging::ExceptionHolder::_tao_seq_Octet_var
@@ -3583,9 +3583,9 @@ Messaging::ReplyHandler_out::operator-> (void)
   return this->ptr_;
 }
 
-#endif /* TAO_HAS_AMI_CALLBACK */
+#endif /* TAO_HAS_AMI_CALLBACK == 1 */
 
-#if defined(TAO_HAS_AMI_POLLER)
+#if (TAO_HAS_AMI_POLLER == 1)
 
 ACE_INLINE
 Messaging::Poller::Poller (void) // default constructor
@@ -3945,12 +3945,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::PolicyValue
   return 0; // error
 }
 
-#endif /* TAO_HAS_AMI_POLLER */
+#endif /* TAO_HAS_AMI_POLLER == 1 */
 
 
 // ****************************************************************
 
-#if defined(TAO_HAS_AMI_CALLBACK) || defined(TAO_HAS_AMI_POLLER)
+#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
 
 ACE_INLINE CORBA::Boolean
 operator<< (TAO_OutputCDR &strm, const Messaging::ExceptionHolder *_tao_valuetype)
@@ -4054,9 +4054,9 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::ExceptionHo
 }
 
 
-#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
+#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
 
-#if defined (TAO_HAS_AMI_CALLBACK)
+#if (TAO_HAS_AMI_CALLBACK == 1)
 
 // ****************************************************************
 
@@ -4109,11 +4109,11 @@ operator>> (
   return 0;
 }
 
-#endif /* TAO_HAS_AMI_CALLBACK */
+#endif /* TAO_HAS_AMI_CALLBACK == 1 */
 
 // ****************************************************************
 
-#if defined (TAO_HAS_AMI_POLLER)
+#if (TAO_HAS_AMI_POLLER == 1)
 
 ACE_INLINE CORBA::Boolean
 operator<< (
@@ -4164,4 +4164,4 @@ operator>> (
   return 0;
 }
 
-#endif /* TAO_HAS_AMI_POLLER */
+#endif /* TAO_HAS_AMI_POLLER == 1 */
diff --git a/TAO/tao/MessagingS.i b/TAO/tao/MessagingS.i
index bb950c58807..cb169078791 100644
--- a/TAO/tao/MessagingS.i
+++ b/TAO/tao/MessagingS.i
@@ -8,7 +8,7 @@
 // Information about TAO is available at:
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#if defined (TAO_HAS_AMI_POLLER)
+#if (TAO_HAS_AMI_POLLER == 1)
 ACE_INLINE void POA_Messaging::Poller::is_ready_skel (
                                                       CORBA::ServerRequest &req,
                                                       void *obj,
@@ -39,4 +39,4 @@ ACE_INLINE void POA_Messaging::Poller::create_pollable_set_skel (
                                                  env
                                                  );
 }
-#endif /* TAO_HAS_AMI_POLLER */
+#endif /* TAO_HAS_AMI_POLLER == 1 */
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index 02b51715b6c..143aec01210 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
+
 #include "ace/Dynamic_Service.h"
 
 ACE_INLINE ACE_Thread_Manager *
@@ -114,7 +115,7 @@ TAO_ORB_Core::to_unicode (void) const
   return this->to_unicode_;
 }
 
-#if defined (TAO_HAS_CORBA_MESSAGING)
+#if (TAO_HAS_CORBA_MESSAGING == 1)
 ACE_INLINE TAO_Policy_Manager *
 TAO_ORB_Core::policy_manager (void)
 {
@@ -129,7 +130,7 @@ TAO_ORB_Core::get_default_policy (
   return this->default_policies_->get_policy (policy, ACE_TRY_ENV);
 }
 
-ACE_INLINE TAO_RelativeRoundtripTimeoutPolicy_i *
+ACE_INLINE TAO_RelativeRoundtripTimeoutPolicy *
 TAO_ORB_Core::default_relative_roundtrip_timeout (void) const
 {
   return this->default_policies_->relative_roundtrip_timeout ();
@@ -153,7 +154,7 @@ TAO_ORB_Core::default_buffering_constraint (void) const
   return this->default_policies_->buffering_constraint ();
 }
 
-#endif /* TAO_HAS_CORBA_MESSAGING */
+#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
 ACE_INLINE TAO_ORB_Core_TSS_Resources*
 TAO_ORB_Core::get_tss_resources (void)
@@ -194,6 +195,67 @@ TAO_ORB_Core::orbid (void) const
   return this->orbid_;
 }
 
+ACE_INLINE void
+TAO_ORB_Core::implrepo_service (const CORBA::Object_ptr ir)
+{
+  this->implrepo_service_ = ir;
+}
+
+// ****************************************************************
+
+#if (TAO_HAS_CORBA_MESSAGING == 1)
+
+ACE_INLINE TAO_None_Sync_Strategy &
+TAO_ORB_Core::none_sync_strategy (void)
+{
+  return *this->none_sync_strategy_;
+}
+
+#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
+
+ACE_INLINE TAO_Transport_Sync_Strategy &
+TAO_ORB_Core::transport_sync_strategy (void)
+{
+  return *this->transport_sync_strategy_;
+}
+
+#if (TAO_HAS_CORBA_MESSAGING == 1)
+
+ACE_INLINE TAO_Policy_Current &
+TAO_ORB_Core::policy_current (void)
+{
+  return *this->policy_current_;
+}
+
+#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
+
+#if (TAO_HAS_RT_CORBA == 1)
+
+ACE_INLINE TAO_Priority_Mapping *
+TAO_ORB_Core::priority_mapping (void)
+{
+  return this->priority_mapping_;
+}
+
+#endif /* TAO_HAS_RT_CORBA == 1 */
+
+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.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/Policy_Manager.i b/TAO/tao/Policy_Manager.i
index 119ac1504d1..d43444083a2 100644
--- a/TAO/tao/Policy_Manager.i
+++ b/TAO/tao/Policy_Manager.i
@@ -10,7 +10,7 @@ TAO_Policy_Manager_Impl::TAO_Policy_Manager_Impl (void)
 {
 }
 
-ACE_INLINE TAO_RelativeRoundtripTimeoutPolicy_i *
+ACE_INLINE TAO_RelativeRoundtripTimeoutPolicy *
 TAO_Policy_Manager_Impl::relative_roundtrip_timeout (void) const
 {
   return this->relative_roundtrip_timeout_;
@@ -66,7 +66,7 @@ TAO_Policy_Manager::set_policy_overrides (
   this->impl_.set_policy_overrides (policies, set_add, ACE_TRY_ENV);
 }
 
-ACE_INLINE TAO_RelativeRoundtripTimeoutPolicy_i *
+ACE_INLINE TAO_RelativeRoundtripTimeoutPolicy *
 TAO_Policy_Manager::relative_roundtrip_timeout (void) const
 {
   return this->impl_.relative_roundtrip_timeout ();
@@ -122,7 +122,7 @@ TAO_Policy_Current_Impl::set_policy_overrides (
   this->manager_impl_.set_policy_overrides (policies, set_add, ACE_TRY_ENV);
 }
 
-ACE_INLINE TAO_RelativeRoundtripTimeoutPolicy_i *
+ACE_INLINE TAO_RelativeRoundtripTimeoutPolicy *
 TAO_Policy_Current_Impl::relative_roundtrip_timeout (void) const
 {
   return this->manager_impl_.relative_roundtrip_timeout ();
@@ -179,7 +179,7 @@ TAO_Policy_Current::set_policy_overrides (
   impl.set_policy_overrides (policies, set_add, ACE_TRY_ENV);
 }
 
-ACE_INLINE TAO_RelativeRoundtripTimeoutPolicy_i *
+ACE_INLINE TAO_RelativeRoundtripTimeoutPolicy *
 TAO_Policy_Current::relative_roundtrip_timeout (void) const
 {
   TAO_Policy_Current_Impl &impl = this->implementation ();
diff --git a/TAO/tao/params.i b/TAO/tao/params.i
index 795cb20b4bd..539949e29c6 100644
--- a/TAO/tao/params.i
+++ b/TAO/tao/params.i
@@ -1,30 +1,22 @@
 // -*- C++ -*-
 // $Id$
 
-ACE_INLINE int
-TAO_ORB_Parameters::preconnects (ACE_CString &preconnects)
-{
-  return this->parse_endpoints (preconnects,
-                                this->preconnect_insertion_strategy_);
-}
-
-ACE_INLINE TAO_PreconnectSet &
+ACE_INLINE TAO_EndpointSet &
 TAO_ORB_Parameters::preconnects (void)
 {
   return this->preconnects_list_;
 }
 
-ACE_INLINE void
-TAO_ORB_Parameters::add_preconnect (ACE_CString &preconnect)
+ACE_INLINE int
+TAO_ORB_Parameters::preconnects (ACE_CString &preconnects)
 {
-  this->preconnects_list_.enqueue_tail (preconnect);
+  return this->parse_endpoints (preconnects, this->preconnects ());
 }
 
-ACE_INLINE int
-TAO_ORB_Parameters::endpoints (ACE_CString &endpoints)
+ACE_INLINE void
+TAO_ORB_Parameters::add_preconnect (ACE_CString &preconnect)
 {
-  return this->parse_endpoints (endpoints,
-                                this->endpoint_insertion_strategy_);
+  this->preconnects ().enqueue_tail (preconnect);
 }
 
 ACE_INLINE TAO_EndpointSet &
@@ -33,10 +25,16 @@ TAO_ORB_Parameters::endpoints (void)
   return this->endpoints_list_;
 }
 
+ACE_INLINE int
+TAO_ORB_Parameters::endpoints (ACE_CString &endpoints)
+{
+  return this->parse_endpoints (endpoints, this->endpoints ());
+}
+
 ACE_INLINE void
 TAO_ORB_Parameters::add_endpoint (ACE_CString &endpoint)
 {
-  this->endpoints_list_.insert (endpoint);
+  this->endpoints ().enqueue_tail (endpoint);
 }
 
 ACE_INLINE int