ChangeLogTag: Fri Apr 26 18:24:02 2002 Balachandran Natarajan <bala@guajira.cs.wustl.edu>

58 files changed, 2964 insertions, 3595 deletions

diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp
index 0b6eef1cf32..559bcf730a1 100644
--- a/TAO/tao/BoundsC.cpp
+++ b/TAO/tao/BoundsC.cpp
@@ -41,7 +41,8 @@
 
 // Default constructor.
 CORBA::Bounds::Bounds (void)
-  : CORBA_UserException ("IDL:omg.org/CORBA/Bounds:1.0")
+  : CORBA_UserException ("IDL:omg.org/CORBA/Bounds:1.0",
+                         "Bounds")
 {
 }
 
@@ -52,7 +53,8 @@ CORBA::Bounds::~Bounds (void)
 
 // Copy constructor.
 CORBA::Bounds::Bounds (const ::CORBA::Bounds &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (_tao_excp._rep_id (),
+                         _tao_excp._name ())
 {
 }
 
@@ -73,7 +75,7 @@ void CORBA::Bounds::_tao_any_destructor (void *_tao_void_pointer)
 CORBA::Bounds *
 CORBA::Bounds::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/Bounds:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/Bounds:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (Bounds *, exc);
     }
diff --git a/TAO/tao/BoundsC.i b/TAO/tao/BoundsC.i
index 85b84da1e7b..f9bccb90aa5 100644
--- a/TAO/tao/BoundsC.i
+++ b/TAO/tao/BoundsC.i
@@ -26,7 +26,7 @@
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Bounds &_tao_aggregate)
 {
   // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
+  if (strm << _tao_aggregate._rep_id ())
     return 1;
   else
     return 0;
diff --git a/TAO/tao/Cache_Entries.h b/TAO/tao/Cache_Entries.h
index 4a616d7b664..7633bc98433 100644
--- a/TAO/tao/Cache_Entries.h
+++ b/TAO/tao/Cache_Entries.h
@@ -72,9 +72,10 @@ public:
   /// Return the underlying transport
   const TAO_Transport *transport (void) const;
 
+  /// Set <recycle_state>.
   void recycle_state (ACE_Recyclable_State new_state);
 
-  /// Get/Set <recycle_state>.
+  /// Get <recycle_state>.
   ACE_Recyclable_State recycle_state (void);
 
   /// Relinquish ownership of the TAO_Transport object associated with
@@ -140,9 +141,11 @@ public:
   /// Make a deep copy of the underlying pointer
   void duplicate (void);
 
+  //@{
   /// Return the index value
   CORBA::ULong index (void);
   CORBA::ULong index (void) const;
+  //@}
 
   /// Set the index value. This calls should not be used by any users
   /// but for the TAO_Transport_Cache_Manager class.
diff --git a/TAO/tao/ChangeLog b/TAO/tao/ChangeLog
index f3d4b6050e2..9fe2cc53d8c 100644
--- a/TAO/tao/ChangeLog
+++ b/TAO/tao/ChangeLog
@@ -1,3 +1,66 @@
+Fri Apr 26 18:24:02 2002  Balachandran Natarajan  <bala@guajira.cs.wustl.edu>
+
+	* tao/BoundsC.cpp:
+	* tao/BoundsC.i:
+	* tao/Cache_Entries.h:
+	* tao/ClientRequestInfo_i.cpp:  
+  	* tao/Environment.cpp:
+  	* tao/Exception.cpp:
+  	* tao/Exception.h:
+  	* tao/GIOP_Message_Base.cpp:
+  	* tao/GIOP_Message_Base.h:
+  	* tao/GIOP_Message_Generator_Parser_12.cpp:
+  	* tao/GIOP_Message_Lite.cpp:
+  	* tao/IIOP_Acceptor.cpp:
+  	* tao/IIOP_Connector.cpp:
+  	* tao/IIOP_Connector.h:
+  	* tao/IOPC.cpp:
+  	* tao/Invocation.cpp:
+  	* tao/Invocation.h:
+  	* tao/Invocation.i:
+  	* tao/Makefile:
+  	* tao/Messaging_SyncScopeC.cpp:
+  	* tao/Messaging_SyncScopeC.h:
+  	* tao/Messaging_SyncScopeC.i:
+  	* tao/NVList.cpp:
+  	* tao/ORB.cpp:
+  	* tao/ORBInitializer_Registry.cpp:
+  	* tao/ORBInitializer_Registry.h:
+  	* tao/ORB_Core.cpp:
+  	* tao/ORB_Core.h:
+  	* tao/ORB_Table.cpp:
+  	* tao/ORB_Table.h:
+  	* tao/ORB_Table.inl:
+  	* tao/PICurrent.cpp:
+  	* tao/PICurrent.inl:
+  	* tao/PolicyC.cpp:
+	* tao/PolicyC.i:
+	* tao/PollableC.cpp:
+	* tao/PortableInterceptorC.cpp:
+	* tao/PortableInterceptorC.i:
+	* tao/Stub.cpp:
+	* tao/Stub.h:
+	* tao/TAOC.cpp:
+	* tao/TAOC.h:
+	* tao/TAOC.i:
+	* tao/Transport.cpp:
+	* tao/Transport_Connector.cpp:
+	* tao/Transport_Connector.h:
+	* tao/Typecode.cpp:
+	* tao/WrongTransactionC.cpp:
+	* tao/WrongTransactionC.i:
+	* tao/default_resource.cpp:
+	* tao/orbconf.h:
+	* tao/Messaging/Makefile:
+	* tao/RTCORBA/Makefile:
+	* tao/Strategies/DIOP_Connector.cpp:
+	* tao/Strategies/DIOP_Connector.h:
+	* tao/Strategies/Makefile:
+	* tao/Strategies/SHMIOP_Connector.cpp:
+	* tao/Strategies/SHMIOP_Connector.h:
+	* tao/Strategies/UIOP_Connector.cpp:
+	* tao/Strategies/UIOP_Connector.h: Merged with the main trunk.
+
 Fri Apr 26 13:18:53 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/Strategies/UIOP_Connector.cpp:
diff --git a/TAO/tao/ClientRequestInfo_i.cpp b/TAO/tao/ClientRequestInfo_i.cpp
index 0201005610e..72c7de73bbb 100644
--- a/TAO/tao/ClientRequestInfo_i.cpp
+++ b/TAO/tao/ClientRequestInfo_i.cpp
@@ -154,7 +154,7 @@ TAO_ClientRequestInfo_i::received_exception_id (
                         0);
     }
 
-  return CORBA::string_dup (this->caught_exception_->_id ());
+  return CORBA::string_dup (this->caught_exception_->_rep_id ());
 }
 
 IOP::TaggedComponent *
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index 27d15b5fbca..1b94053e5ea 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -147,7 +147,7 @@ CORBA::Environment::exception_type (void) const
   // are system exceptions ... except for a couple that are related to
   // TypeCodes.
 
-  const char *id = this->exception_->_id ();
+  const char *id = this->exception_->_rep_id ();
 
   if ((ACE_OS::strncmp (id,
                         sysex_prefix,
@@ -166,7 +166,7 @@ CORBA_Environment::exception_id (void) const
   if (this->exception_ == 0)
     return 0;
 
-  return this->exception_->_id ();
+  return this->exception_->_rep_id ();
 }
 
 // Diagnostic utility routine: describe the exception onto the
@@ -178,7 +178,7 @@ CORBA::Environment::print_exception (const char *info,
 {
   if (this->exception_)
     {
-      const char *id = this->exception_->_id ();
+      const char *id = this->exception_->_rep_id ();
 
       ACE_DEBUG ((LM_ERROR,
                   ACE_TEXT ("TAO: (%P|%t) EXCEPTION, %s\n"),
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 4f50cd2cb56..b6dc365d14e 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -41,49 +41,71 @@ extern CORBA::TypeCode_ptr TC_completion_status;
 
 // ****************************************************************
 
-CORBA_Exception::CORBA_Exception (const char *repository_id)
-  : id_ (CORBA::string_dup (repository_id))
+CORBA_Exception::CORBA_Exception (const char *repository_id,
+                                  const char *local_name)
+  : id_ (CORBA::string_dup (repository_id)),
+    name_ ( CORBA::string_dup (local_name))
 {
-  ACE_ASSERT (this->id_ != 0);
+  ACE_ASSERT (this->id_ != 0 && this->name_ != 0);
 }
 
 CORBA_Exception::CORBA_Exception (const CORBA_Exception &src)
-  : id_ (CORBA::string_dup (src.id_))
+  : id_ (CORBA::string_dup (src.id_)),
+    name_ (CORBA::string_dup (src.name_))
 {
-  ACE_ASSERT (this->id_ != 0);
+  ACE_ASSERT (this->id_ != 0 && this->name_ != 0);
 }
 
 // NOTE: It's this code, not anything defined in a subclass, which is
 // responsible for releasing any storage owned by the exception.  It
-// can do this because it's got the typecode.
+// can do this because it's got the local name and the id.
 
 CORBA_Exception::CORBA_Exception (void)
-  :  id_ (0)
+  : id_ (0),
+    name_ (0)
 {
 }
 
 CORBA_Exception::~CORBA_Exception (void)
 {
   CORBA::string_free (this->id_);
+  CORBA::string_free (this->name_);
 }
 
 CORBA_Exception &
 CORBA_Exception::operator= (const CORBA_Exception &src)
 {
   if (this->id_)
-    CORBA::string_free (this->id_);
+    {
+      CORBA::string_free (this->id_);
+    }
+
   this->id_ = CORBA::string_dup (src.id_);
   ACE_ASSERT (this->id_ != 0);
 
+  if (this->name_)
+    {
+      CORBA::string_free (this->name_);
+    }
+
+  this->name_ = CORBA::string_dup (src.name_);
+  ACE_ASSERT (this->name_ != 0);
+
   return *this;
 }
 
 const char *
-CORBA_Exception::_id (void) const
+CORBA_Exception::_rep_id (void) const
 {
   return this->id_;
 }
 
+const char *
+CORBA_Exception::_name (void) const
+{
+  return this->name_;
+}
+
 CORBA::TypeCode_ptr
 CORBA_Exception::_type (void) const
 {
@@ -133,23 +155,7 @@ CORBA_Exception::_tao_any_destructor (void *x)
 ostream& operator<< (ostream &os,
                      const CORBA_Exception &e)
 {
-  const char *p = 0;
-
-  CORBA::TypeCode_ptr tc = e._type ();
-
-  if (tc != CORBA::TypeCode::_nil ())
-    {
-      p = tc->name ();
-    }
-
-  if (p != 0 && *p != '\0')
-    {
-      os << p << " (" << e._id () << ')';
-    }
-  else
-    {
-      os << e._id ();
-    }
+  os << e._name () << " (" << e._rep_id () << ')';
 
   return os;
 }
@@ -162,8 +168,10 @@ CORBA_UserException::CORBA_UserException (void)
 {
 }
 
-CORBA_UserException::CORBA_UserException (const char *repository_id)
-  : CORBA_Exception (repository_id)
+CORBA_UserException::CORBA_UserException (const char *repository_id,
+                                          const char *local_name)
+  : CORBA_Exception (repository_id, 
+                     local_name)
 {
 }
 
@@ -190,8 +198,11 @@ CORBA_UserException*
 CORBA_UserException::_downcast (CORBA_Exception* exception)
 {
   if (exception->_is_a ("IDL:omg.org/CORBA/UserException:1.0"))
-    return ACE_dynamic_cast (CORBA_UserException *,
-                             exception);
+    {
+      return ACE_dynamic_cast (CORBA_UserException *,
+                               exception);
+    }
+
   return 0;
 }
 
@@ -202,7 +213,7 @@ CORBA_UserException::_info (void) const
   // within it ...
 
   ACE_CString user_exception_info = "user exception, ID '";
-  user_exception_info += this->_id ();
+  user_exception_info += this->_rep_id ();
   user_exception_info += "'";
   return user_exception_info;
 }
@@ -221,9 +232,11 @@ CORBA_SystemException::CORBA_SystemException (void)
 }
 
 CORBA_SystemException::CORBA_SystemException (const char *repository_id,
+                                              const char *local_name,
                                               CORBA::ULong code,
                                               CORBA::CompletionStatus completed)
-  : CORBA_Exception (repository_id),
+  : CORBA_Exception (repository_id,
+                     local_name),
     minor_ (code),
     completed_ (completed)
 {
@@ -263,8 +276,11 @@ CORBA_SystemException*
 CORBA_SystemException::_downcast (CORBA_Exception* exception)
 {
   if (exception->_is_a ("IDL:omg.org/CORBA/SystemException:1.0"))
-    return ACE_dynamic_cast (CORBA_SystemException *,
-                             exception);
+    {
+      return ACE_dynamic_cast (CORBA_SystemException *,
+                               exception);
+    }
+
   return 0;
 }
 
@@ -272,10 +288,13 @@ void
 CORBA_SystemException::_tao_encode (TAO_OutputCDR &cdr
                                     ACE_ENV_ARG_DECL) const
 {
-  if (cdr.write_string (this->_id ())
+  if (cdr.write_string (this->_rep_id ())
       && cdr.write_ulong (this->minor ())
       && cdr.write_ulong (this->completed ()))
-    return;
+    {
+      return;
+    }
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -294,6 +313,7 @@ CORBA_SystemException::_tao_decode (TAO_InputCDR &cdr
       this->completed_ = CORBA::CompletionStatus (tmp);
       return;
     }
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -386,7 +406,7 @@ CORBA_SystemException::_info (void) const
   // exception value so it can be queried.
 
   ACE_CString info = "system exception, ID '";
-  info += this->_id ();
+  info += this->_rep_id ();
   info += "'\n";
 
   CORBA::ULong VMCID =
@@ -1046,7 +1066,7 @@ TAO_Exceptions::init (ACE_ENV_SINGLE_ARG_DECL)
 #undef  TAO_SYSTEM_EXCEPTION
 
   TAO_Exceptions::make_unknown_user_typecode (CORBA::_tc_UnknownUserException
-                                               ACE_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_SystemException *
@@ -1116,6 +1136,7 @@ STANDARD_EXCEPTION_LIST
 #define TAO_SYSTEM_EXCEPTION(name) \
 CORBA_##name :: CORBA_##name (void) \
   :  CORBA_SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \
+                            #name, \
                             TAO_DEFAULT_MINOR_CODE, \
                             CORBA::COMPLETED_NO) \
 { \
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 4649d70b29c..a72219a7101 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -72,7 +72,10 @@ public:
   // = These are TAO-specific extensions.
 
   /// Return the repository ID of the Exception.
-  const char *_id (void) const;
+  const char *_rep_id (void) const;
+
+  /// Return the name of the Exception.
+  const char *_name (void) const;
 
   /// Will be overridden in the concrete derived classes.
   virtual CORBA::TypeCode_ptr _type (void) const;
@@ -81,7 +84,8 @@ public:
   virtual int _is_a (const char* repository_id) const;
 
   /// Constructor from a respository id.
-  CORBA_Exception (const char* repository_id);
+  CORBA_Exception (const char *repository_id,
+                   const char *local_name);
 
   /// Print the exception <ex> to output determined by <f>.  This
   /// function is not CORBA compliant.
@@ -130,8 +134,9 @@ protected:
   // Default constructor is protected.
 
 private:
-  /// Storage of our repository id.
+  /// Storage of our repository id and local name.
   char *id_;
+  char *name_;
 };
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
@@ -168,7 +173,8 @@ public:
   // = TAO specific extension.
 
   /// Constructor from a repository id.
-  CORBA_UserException (const char* repository_id);
+  CORBA_UserException (const char *repository_id,
+                       const char *local_name);
 
   virtual int _is_a (const char *interface_id) const;
 
@@ -253,14 +259,16 @@ protected:
 
   /// Constructor using a repository id.
   CORBA_SystemException (const char *repository_id,
+                         const char *local_name,
                          CORBA::ULong code,
                          CORBA::CompletionStatus completed);
 
   /// Return the exception description associated with the given OMG
   /// minor code.
   static const char *_tao_get_omg_exception_description (
-    const CORBA::SystemException &exc,
-    CORBA::ULong minor_code);
+      const CORBA::SystemException &exc,
+      CORBA::ULong minor_code
+    );
 
 private:
   /// Minor code.
@@ -282,7 +290,10 @@ public: \
   CORBA_ ## name (void); \
   CORBA_ ## name (CORBA::ULong code, \
                   CORBA::CompletionStatus completed) \
-    : CORBA_SystemException ("IDL:omg.org/CORBA/" #name ":1.0", code, completed) \
+    : CORBA_SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \
+                             #name, \
+                             code, \
+                             completed) \
     { } \
   static CORBA_##name * _downcast (CORBA_Exception* exception); \
   virtual int _is_a (const char* type_id) const; \
@@ -371,7 +382,8 @@ public:
   /// Create a CORBA::SystemException given the interface repository ID.
   static CORBA_SystemException *create_system_exception (
       const char *id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
 
 
   /**
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index b6cdc7fa5b1..57cd8d7241e 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -905,7 +905,7 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
       if (response_required)
         {
           result = this->send_reply_exception (transport,
-                                               this->orb_core_,
+                                               output,
                                                request_id,
                                                &request.reply_service_info (),
                                                &ACE_ANY_EXCEPTION);
@@ -963,7 +963,7 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
                                     CORBA::COMPLETED_MAYBE);
 
           result = this->send_reply_exception (transport,
-                                               this->orb_core_,
+                                               output,
                                                request_id,
                                                &request.reply_service_info (),
                                                &exception);
@@ -1357,31 +1357,12 @@ TAO_GIOP_Message_Base::
 int
 TAO_GIOP_Message_Base::send_reply_exception (
     TAO_Transport *transport,
-    TAO_ORB_Core* orb_core,
+    TAO_OutputCDR &output,
     CORBA::ULong request_id,
     IOP::ServiceContextList *svc_info,
     CORBA::Exception *x
   )
 {
-  // Create a new output CDR stream
-  char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
-#if defined(ACE_HAS_PURIFY)
-  (void) ACE_OS::memset (repbuf,
-                         '\0',
-                         sizeof repbuf);
-#endif /* ACE_HAS_PURIFY */
-  TAO_OutputCDR output (repbuf,
-                        sizeof repbuf,
-                        TAO_ENCAP_BYTE_ORDER,
-                        orb_core->output_cdr_buffer_allocator (),
-                        orb_core->output_cdr_dblock_allocator (),
-                        orb_core->output_cdr_msgblock_allocator (),
-                        orb_core->orb_params ()->cdr_memcpy_tradeoff (),
-                        TAO_DEF_GIOP_MAJOR,
-                        TAO_DEF_GIOP_MINOR,
-                        orb_core->to_iso8859 (),
-                        orb_core->to_unicode ());
-
   TAO_Pluggable_Reply_Params_Base reply_params;
   reply_params.request_id_ = request_id;
   reply_params.svc_ctx_.length (0);
diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h
index cd5ffc5fe55..44b0feeefba 100644
--- a/TAO/tao/GIOP_Message_Base.h
+++ b/TAO/tao/GIOP_Message_Base.h
@@ -47,7 +47,7 @@ public:
 
   /// Constructor
   TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core,
-			 size_t input_cdr_size = ACE_CDR::DEFAULT_BUFSIZE);
+                         size_t input_cdr_size = ACE_CDR::DEFAULT_BUFSIZE);
 
   /// Dtor
   virtual ~TAO_GIOP_Message_Base (void);
@@ -55,7 +55,7 @@ public:
   /// Initialize the underlying state object based on the <major> and
   /// <minor> revision numbers
   virtual void init (CORBA::Octet major,
-		     CORBA::Octet minor);
+                     CORBA::Octet minor);
 
   /// Reset the messaging the object
   virtual void reset (void);
@@ -63,8 +63,8 @@ public:
   /// Write the RequestHeader in to the <cdr> stream. The underlying
   /// implementation of the mesaging should do the right thing.
   virtual int generate_request_header (TAO_Operation_Details &op,
-				       TAO_Target_Specification &spec,
-				       TAO_OutputCDR &cdr);
+                                       TAO_Target_Specification &spec,
+                                       TAO_OutputCDR &cdr);
 
   /// Write the RequestHeader in to the <cdr> stream.
   virtual int generate_locate_request_header (
@@ -84,8 +84,8 @@ public:
   /// message is read and handled. Returns -1 on errors. If <block> is
   /// 1, then reply is read in a blocking manner.
   virtual int read_message (TAO_Transport *transport,
-			    int block = 0,
-			    ACE_Time_Value *max_wait_time = 0);
+                            int block = 0,
+                            ACE_Time_Value *max_wait_time = 0);
 
 
   /// Format the message. As we have not written the message length in
@@ -105,23 +105,23 @@ public:
    * 0 if there are no more messages in <incoming>.
    */
   virtual int extract_next_message (ACE_Message_Block &incoming,
-				    TAO_Queued_Data *&qd);
+                                    TAO_Queued_Data *&qd);
 
   /// Check whether the node <qd> needs consolidation from <incoming>
   virtual int consolidate_node (TAO_Queued_Data *qd,
-				ACE_Message_Block &incoming);
+                                ACE_Message_Block &incoming);
 
   /// Get the details of the message parsed through the <qd>.
   virtual void get_message_data (TAO_Queued_Data *qd);
 
   /// @@Bala:Docu??
   virtual int consolidate_fragments (TAO_Queued_Data *dqd,
-				     const TAO_Queued_Data *sqd);
+                                     const TAO_Queued_Data *sqd);
 
   /// Process the request message that we have received on the
   /// connection
   virtual int process_request_message (TAO_Transport *transport,
-				       TAO_Queued_Data *qd);
+                                       TAO_Queued_Data *qd);
 
 
   /// Parse the reply message that we received and return the reply
@@ -143,25 +143,25 @@ protected:
 
   /// Processes the <GIOP_REQUEST> messages
   int process_request (TAO_Transport *transport,
-		       TAO_InputCDR &input,
-		       TAO_OutputCDR &output,
-		       TAO_GIOP_Message_Generator_Parser *);
+                       TAO_InputCDR &input,
+                       TAO_OutputCDR &output,
+                       TAO_GIOP_Message_Generator_Parser *);
 
   /// Processes the <GIOP_LOCATE_REQUEST> messages
   int process_locate_request (TAO_Transport *transport,
-			      TAO_InputCDR &input,
-			      TAO_OutputCDR &output,
-			      TAO_GIOP_Message_Generator_Parser *);
+                              TAO_InputCDR &input,
+                              TAO_OutputCDR &output,
+                              TAO_GIOP_Message_Generator_Parser *);
 
   /// Set the state
   void set_state (CORBA::Octet major,
-		  CORBA::Octet minor,
-		  TAO_GIOP_Message_Generator_Parser *&);
+                  CORBA::Octet minor,
+                  TAO_GIOP_Message_Generator_Parser *&);
 
   /// Print out a debug messages..
   void dump_msg (const char *label,
-		 const u_char *ptr,
-		 size_t len);
+                 const u_char *ptr,
+                 size_t len);
 
   /// Get the message type. The return value would be one of the
   /// following:
@@ -177,33 +177,33 @@ private:
   /// NOTE: If the GIOP header happens to change in the future, we can
   /// push this method in to the generator_parser classes.
   int write_protocol_header (TAO_GIOP_Message_Type t,
-			     TAO_OutputCDR &msg);
+                             TAO_OutputCDR &msg);
 
   /// Make a <GIOP_LOCATEREPLY> and hand that over to the transport so
   /// that it can be sent over the connection.
   /// NOTE:As on date 1.1 & 1.2 seem to have similar headers. Till an
   /// unmanageable difference comes let them be implemented here.
   int make_send_locate_reply (TAO_Transport *transport,
-			      TAO_GIOP_Locate_Request_Header &request,
-			      TAO_GIOP_Locate_Status_Msg &status,
-			      TAO_OutputCDR &output,
-			      TAO_GIOP_Message_Generator_Parser *);
+                              TAO_GIOP_Locate_Request_Header &request,
+                              TAO_GIOP_Locate_Status_Msg &status,
+                              TAO_OutputCDR &output,
+                              TAO_GIOP_Message_Generator_Parser *);
 
   /// Send error messages
   int  send_error (TAO_Transport *transport);
 
   /// Close a connection, first sending GIOP::CloseConnection.
   void send_close_connection (const TAO_GIOP_Message_Version &version,
-			      TAO_Transport *transport,
-			      void *ctx);
+                              TAO_Transport *transport,
+                              void *ctx);
 
   /// We must send a LocateReply through <transport>, this request
   /// resulted in some kind of exception.
   int send_reply_exception (TAO_Transport *transport,
-			    TAO_ORB_Core* orb_core,
-			    CORBA::ULong request_id,
-			    IOP::ServiceContextList *svc_info,
-			    CORBA::Exception *x);
+                            TAO_OutputCDR &cdr,
+                            CORBA::ULong request_id,
+                            IOP::ServiceContextList *svc_info,
+                            CORBA::Exception *x);
 
 
   /// Write the locate reply header
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
index f4492faa8bb..ff475755547 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "GIOP_Message_Generator_Parser_12.h"
 #include "GIOP_Utils.h"
 #include "GIOP_Message_State.h"
@@ -8,7 +6,6 @@
 #include "CDR.h"
 #include "Any.h"
 #include "debug.h"
-#include "OctetSeqC.h"
 #include "Pluggable_Messaging_Utils.h"
 #include "TAO_Server_Request.h"
 #include "TAOC.h"
@@ -54,18 +51,18 @@ TAO_GIOP_Message_Generator_Parser_12::write_request_header (
     msg << CORBA::Any::from_octet (3);
   // Second the response flags
   // Sync scope - ignored by server if request is not oneway.
-  else if (response_flags == CORBA::Octet (TAO::SYNC_NONE) ||
-           response_flags == CORBA::Octet (TAO::SYNC_WITH_TRANSPORT) ||
-           response_flags == CORBA::Octet (TAO::SYNC_EAGER_BUFFERING) ||
-           response_flags == CORBA::Octet (TAO::SYNC_DELAYED_BUFFERING))
+  else if (response_flags == CORBA::Octet (Messaging::SYNC_NONE)
+           || response_flags == CORBA::Octet (Messaging::SYNC_WITH_TRANSPORT)
+           || response_flags == CORBA::Octet (TAO::SYNC_EAGER_BUFFERING)
+           || response_flags == CORBA::Octet (TAO::SYNC_DELAYED_BUFFERING))
     // No response required.
     msg << CORBA::Any::from_octet (0);
 
-  else if (response_flags == CORBA::Octet (TAO::SYNC_WITH_SERVER))
+  else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_SERVER))
     // Return before dispatching to the servant
     msg << CORBA::Any::from_octet (1);
 
-  else if (response_flags == CORBA::Octet (TAO::SYNC_WITH_TARGET))
+  else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_TARGET))
     // Return after dispatching servant.
     msg << CORBA::Any::from_octet (3);
   else
@@ -89,10 +86,10 @@ TAO_GIOP_Message_Generator_Parser_12::write_request_header (
   msg << opdetails.request_service_info ();
 
   // We align the pointer only if the operation has arguments.
-  if (opdetails.argument_flag ())
+  if (opdetails.argument_flag ()
+      && msg.align_write_ptr (TAO_GIOP_MESSAGE_ALIGN_PTR) == -1)
     {
-      if (msg.align_write_ptr (TAO_GIOP_MESSAGE_ALIGN_PTR) == -1)
-        return 0;
+      return 0;
     }
 
   return 1;
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index 5484ec35373..d6ae0c1479e 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -1177,22 +1177,22 @@ TAO_GIOP_Message_Lite::write_request_header (
       out_stream << CORBA::Any::from_octet (1);
     }
   // Sync scope - ignored by server if request is not oneway.
-  else if (response_flags == CORBA::Octet (TAO::SYNC_WITH_TRANSPORT)
-	   || response_flags == CORBA::Octet (TAO::SYNC_NONE)
+  else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_TRANSPORT)
+	   || response_flags == CORBA::Octet (Messaging::SYNC_NONE)
 	   || response_flags == CORBA::Octet (TAO::SYNC_EAGER_BUFFERING)
 	   || response_flags == CORBA::Octet (TAO::SYNC_DELAYED_BUFFERING))
     {
       // No response required.
       out_stream << CORBA::Any::from_octet (0);
     }
-  else if (response_flags == CORBA::Octet (TAO::SYNC_WITH_SERVER))
+  else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_SERVER))
     {
       // Return before dispatching servant.  We're also setting the high
       // bit here. This is a temporary fix until the rest of GIOP 1.2 is
       // implemented in TAO.
       out_stream << CORBA::Any::from_octet (129);
     }
-  else if (response_flags == CORBA::Octet (TAO::SYNC_WITH_TARGET))
+  else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_TARGET))
     {
       // Return after dispatching servant.
       out_stream << CORBA::Any::from_octet (3);
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 47dbdcbdad1..0d55ecfa481 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -21,6 +21,7 @@ ACE_RCSID(tao,
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
+template class ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr>;
 template class ACE_Acceptor<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>;
 template class ACE_Strategy_Acceptor<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>;
 template class ACE_Accept_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>;
@@ -33,6 +34,7 @@ template class TAO_Accept_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTO
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
+#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr>
 #pragma instantiate ACE_Acceptor<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>
 #pragma instantiate ACE_Strategy_Acceptor<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>
 #pragma instantiate ACE_Accept_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index c84819450c1..7573330c780 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -140,6 +140,7 @@ TAO_IIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
    return 0;
 }
 
+
 int
 TAO_IIOP_Connector::make_connection (TAO_GIOP_Invocation *invocation,
                                      TAO_Transport_Descriptor_Interface *desc)
@@ -147,11 +148,11 @@ TAO_IIOP_Connector::make_connection (TAO_GIOP_Invocation *invocation,
   TAO_IIOP_Endpoint *iiop_endpoint =
     this->remote_endpoint (desc->endpoint ());
 
-  if (iiop_endpoint == 0)
-    return -1;
+   if (iiop_endpoint == 0)
+     return -1;
 
-  const ACE_INET_Addr &remote_address =
-    iiop_endpoint->object_addr ();
+   const ACE_INET_Addr &remote_address =
+     iiop_endpoint->object_addr ();
 
    if (TAO_debug_level > 2)
      ACE_DEBUG ((LM_DEBUG,
@@ -387,174 +388,3 @@ TAO_IIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
 
   return iiop_endpoint;
 }
-
-
-#if 0
-
-/**
- * @todo Needs to be removed
- */
-int
-TAO_IIOP_Connector::preconnect (const char *preconnects)
-{
-  // Check for the proper protocol prefix.
-  if (this->check_prefix (preconnects) != 0)
-    return 0; // Failure: zero successful preconnections
-
-  const char *protocol_removed =
-    ACE_OS::strstr (preconnects,
-                    "://") + 3;
-  // "+ 3" since strlen of "://" is 3.
-
-  char *preconnections =
-    ACE_OS::strdup (protocol_removed);
-
-  int successes = 0;
-  if (preconnections)
-    {
-      ACE_INET_Addr dest;
-      ACE_Unbounded_Stack<ACE_INET_Addr> dests;
-
-      size_t num_connections;
-
-      char *nextptr = 0;
-      char *where = 0;
-      for (where = ACE::strsplit_r (preconnections, ",", nextptr);
-           where != 0;
-           where = ACE::strsplit_r (0, ",", nextptr))
-        {
-          int version_offset = 0;
-          // Additional offset to remove version from preconnect, if it exists.
-
-          if (isdigit (where[0]) &&
-              where[1] == '.' &&
-              isdigit (where[2]) &&
-              where[3] == '@')
-            version_offset = 4;
-
-          // @@ For now, we just drop the version prefix.  However, at
-          //    some point in the future the version may become useful.
-
-          char *tport = 0;
-          char *thost = where + version_offset;
-          char *sep = ACE_OS::strchr (where, ':');
-
-          if (sep)
-            {
-              *sep = '\0';
-              tport = sep + 1;
-
-              dest.set ((u_short) ACE_OS::atoi (tport), thost);
-              dests.push (dest);
-            }
-          else
-            {
-              // No port was specified so assume that the port will be the
-              // IANA assigned port for IIOP.
-              //
-              //    IIOP:           683
-              //    IIOP over SSL:  684
-
-              dest.set (683, thost);
-              dests.push (dest);
-
-              if (TAO_debug_level > 0)
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              ACE_LIB_TEXT ("TAO (%P|%t) No port specified for <%s>.  ")
-                              ACE_LIB_TEXT ("Using <%d> as default port.\n"),
-                              ACE_TEXT_CHAR_TO_TCHAR(where),
-                              dest.get_port_number ()));
-                }
-            }
-        }
-
-      // Create an array of addresses from the stack, as well as an
-      // array of eventual handlers.
-      num_connections = dests.size ();
-      ACE_INET_Addr *remote_addrs = 0;
-      TAO_IIOP_Connection_Handler **handlers = 0;
-      ACE_TCHAR* failures = 0;
-
-      ACE_NEW_RETURN (remote_addrs,
-                      ACE_INET_Addr[num_connections],
-                      -1);
-
-      ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr> safe_remote_addrs (remote_addrs);
-
-      ACE_NEW_RETURN (handlers,
-                      TAO_IIOP_Connection_Handler *[num_connections],
-                      -1);
-
-      ACE_Auto_Basic_Array_Ptr<TAO_IIOP_Connection_Handler*>
-        safe_handlers (handlers);
-
-      ACE_NEW_RETURN (failures,
-                      ACE_TCHAR[num_connections],
-                      -1);
-
-      // No longer need to worry about exception safety at this point.
-      remote_addrs = safe_remote_addrs.release ();
-      handlers = safe_handlers.release ();
-
-      size_t slot = 0;
-
-      // Fill in the remote address array
-      while (dests.pop (remote_addrs[slot]) == 0)
-        handlers[slot++] = 0;
-
-      // Finally, try to connect.
-      this->base_connector_.connect_n (num_connections,
-                                       handlers,
-                                       remote_addrs,
-                                       failures);
-      // Loop over all the failures and set the handlers that
-      // succeeded to idle state.
-      for (slot = 0;
-           slot < num_connections;
-           slot++)
-        {
-          if (!failures[slot])
-            {
-              TAO_IIOP_Endpoint endpoint (remote_addrs[slot],
-                                          0);
-              TAO_Base_Transport_Property prop (&endpoint);
-
-              // Add the handler to Cache
-              int retval =
-                this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop,
-                                                                                         handlers[slot]->transport ());
-              successes++;
-
-              if (retval != 0 && TAO_debug_level > 4)
-                ACE_DEBUG ((LM_DEBUG,
-                            ACE_LIB_TEXT ("TAO (%P|%t) Unable to add handles\n"),
-                            ACE_LIB_TEXT ("to cache \n")));
-
-              if (TAO_debug_level > 0)
-                ACE_DEBUG ((LM_DEBUG,
-                            ACE_LIB_TEXT ("TAO (%P|%t) Preconnection <%s:%d> ")
-                            ACE_LIB_TEXT ("succeeded.\n"),
-                            ACE_TEXT_CHAR_TO_TCHAR(remote_addrs[slot].get_host_name ()),
-                            remote_addrs[slot].get_port_number ()));
-            }
-          else if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_LIB_TEXT ("TAO (%P|%t) Preconnection <%s:%d> failed.\n"),
-                        ACE_TEXT_CHAR_TO_TCHAR(remote_addrs[slot].get_host_name ()),
-                        remote_addrs[slot].get_port_number ()));
-        }
-
-      ACE_OS::free (preconnections);
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_LIB_TEXT ("TAO (%P|%t) IIOP preconnections: %d successes and ")
-                    ACE_LIB_TEXT ("%d failures.\n"),
-                    successes,
-                    num_connections - successes));
-    }
-  return successes;
-}
-
-#endif /*if 0*/
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index 038bedcfd27..bfed63f2fc1 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -96,11 +96,6 @@ protected:
   /// initialize <tcp_properties_>.
   int init_tcp_properties (void);
 
-private:
-
-  /// Return the remote endpoint, a helper function
-  TAO_IIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep);
-
 protected:
 
   /// TCP configuration properties to be used for all
@@ -113,6 +108,11 @@ protected:
 
 private:
 
+  /// Return the remote endpoint, a helper function
+  TAO_IIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep);
+
+private:
+
   /// Our connect strategy
   TAO_IIOP_CONNECT_STRATEGY connect_strategy_;
 
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index 3a8d2632cd8..7ddabe6bed5 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -1899,7 +1899,8 @@ const char* IOP::Codec::_interface_repository_id (void) const
 
 // Default constructor.
 IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (void)
-  : CORBA_UserException ("IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0")
+  : CORBA_UserException ("IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0",
+                         "InvalidTypeForEncoding")
 {
 }
 
@@ -1910,7 +1911,8 @@ IOP::Codec::InvalidTypeForEncoding::~InvalidTypeForEncoding (void)
 
 // Copy constructor.
 IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (const ::IOP::Codec::InvalidTypeForEncoding &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (_tao_excp._rep_id (),
+                         _tao_excp._name ())
 {
 }
 
@@ -1931,7 +1933,7 @@ void IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor (void *_tao_void_po
 IOP::Codec::InvalidTypeForEncoding *
 IOP::Codec::InvalidTypeForEncoding::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (InvalidTypeForEncoding *, exc);
     }
@@ -2028,7 +2030,8 @@ CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_type (void) const
 
 // Default constructor.
 IOP::Codec::FormatMismatch::FormatMismatch (void)
-  : CORBA_UserException ("IDL:omg.org/IOP/Codec/FormatMismatch:1.0")
+  : CORBA_UserException ("IDL:omg.org/IOP/Codec/FormatMismatch:1.0",
+                         "FormatMismatch")
 {
 }
 
@@ -2039,7 +2042,8 @@ IOP::Codec::FormatMismatch::~FormatMismatch (void)
 
 // Copy constructor.
 IOP::Codec::FormatMismatch::FormatMismatch (const ::IOP::Codec::FormatMismatch &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (_tao_excp._rep_id (),
+                         _tao_excp._name ())
 {
 }
 
@@ -2060,7 +2064,7 @@ void IOP::Codec::FormatMismatch::_tao_any_destructor (void *_tao_void_pointer)
 IOP::Codec::FormatMismatch *
 IOP::Codec::FormatMismatch::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/FormatMismatch:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/FormatMismatch:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (FormatMismatch *, exc);
     }
@@ -2153,7 +2157,8 @@ CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_type (void) const
 
 // Default constructor.
 IOP::Codec::TypeMismatch::TypeMismatch (void)
-  : CORBA_UserException ("IDL:omg.org/IOP/Codec/TypeMismatch:1.0")
+  : CORBA_UserException ("IDL:omg.org/IOP/Codec/TypeMismatch:1.0",
+                         "TypeMismatch")
 {
 }
 
@@ -2164,7 +2169,8 @@ IOP::Codec::TypeMismatch::~TypeMismatch (void)
 
 // Copy constructor.
 IOP::Codec::TypeMismatch::TypeMismatch (const ::IOP::Codec::TypeMismatch &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (_tao_excp._rep_id (),
+                         _tao_excp._name ())
 {
 }
 
@@ -2185,7 +2191,7 @@ void IOP::Codec::TypeMismatch::_tao_any_destructor (void *_tao_void_pointer)
 IOP::Codec::TypeMismatch *
 IOP::Codec::TypeMismatch::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/TypeMismatch:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/TypeMismatch:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (TypeMismatch *, exc);
     }
@@ -2732,7 +2738,8 @@ const char* IOP::CodecFactory::_interface_repository_id (void) const
 
 // Default constructor.
 IOP::CodecFactory::UnknownEncoding::UnknownEncoding (void)
-  : CORBA_UserException ("IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0")
+  : CORBA_UserException ("IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0",
+                         "UnknownEncoding")
 {
 }
 
@@ -2743,7 +2750,8 @@ IOP::CodecFactory::UnknownEncoding::~UnknownEncoding (void)
 
 // Copy constructor.
 IOP::CodecFactory::UnknownEncoding::UnknownEncoding (const ::IOP::CodecFactory::UnknownEncoding &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (_tao_excp._rep_id (),
+                         _tao_excp._name ())
 {
 }
 
@@ -2764,7 +2772,7 @@ void IOP::CodecFactory::UnknownEncoding::_tao_any_destructor (void *_tao_void_po
 IOP::CodecFactory::UnknownEncoding *
 IOP::CodecFactory::UnknownEncoding::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (UnknownEncoding *, exc);
     }
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index be4022059be..d615a6c622f 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -21,6 +21,7 @@
 #include "Pluggable_Messaging_Utils.h"
 #include "Endpoint_Selector_Factory.h"
 #include "Invocation_Endpoint_Selectors.h"
+#include "TAOC.h"
 
 #include "ace/Auto_Ptr.h"
 
@@ -147,7 +148,7 @@ TAO_GIOP_Invocation::~TAO_GIOP_Invocation (void)
 
 void
 TAO_GIOP_Invocation::start (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (TAO_GIOP_INVOCATION_START_ENTER);
   TAO_MINIMAL_TIMEPROBE (TAO_GIOP_INVOCATION_START_ENTER);
@@ -298,7 +299,7 @@ TAO_GIOP_Invocation::perform_call (TAO_Transport_Descriptor_Interface &desc
 void
 TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags
                                      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Then fill in the rest of the RequestHeader
 
@@ -370,7 +371,7 @@ TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags
 int
 TAO_GIOP_Invocation::invoke (CORBA::Boolean is_synchronous
                              ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Countdown_Time countdown (this->max_wait_time_);
 
@@ -805,7 +806,7 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request
 
 void
 TAO_GIOP_Twoway_Invocation::start (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_GIOP_Invocation::start (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
@@ -936,38 +937,34 @@ TAO_GIOP_Oneway_Invocation::TAO_GIOP_Oneway_Invocation (
                                argument_flag,
                                orb_core,
                                byte_order),
-    sync_scope_ (TAO::SYNC_WITH_TRANSPORT)
+    sync_scope_ (Messaging::SYNC_WITH_TRANSPORT)
 {
   int has_synchronization = 0;
-  int scope = this->sync_scope_;
   this->orb_core_->call_sync_scope_hook (this->stub_,
                                          has_synchronization,
-                                         scope);
-
-  this->sync_scope_ = scope;
+                                         this->sync_scope_);
 }
 
 void
 TAO_GIOP_Oneway_Invocation::start (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_GIOP_Invocation::start (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
 }
 
 int
 TAO_GIOP_Oneway_Invocation::invoke (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  if (this->sync_scope_ == TAO::SYNC_NONE
+  if (this->sync_scope_ == Messaging::SYNC_NONE
       || this->sync_scope_ == TAO::SYNC_EAGER_BUFFERING
       || this->sync_scope_ == TAO::SYNC_DELAYED_BUFFERING)
     {
       return TAO_GIOP_Invocation::invoke (0
                                           ACE_ENV_ARG_PARAMETER);
     }
-  if (this->sync_scope_ == TAO::SYNC_WITH_TRANSPORT)
+  if (this->sync_scope_ == Messaging::SYNC_WITH_TRANSPORT)
     {
       return TAO_GIOP_Invocation::invoke (1
                                           ACE_ENV_ARG_PARAMETER);
@@ -1008,7 +1005,7 @@ TAO_GIOP_Oneway_Invocation::invoke (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_GIOP_Locate_Request_Invocation::start (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_GIOP_Invocation::start (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h
index 7b59c95f23f..ef2ef23d30d 100644
--- a/TAO/tao/Invocation.h
+++ b/TAO/tao/Invocation.h
@@ -32,7 +32,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "Synch_Reply_Dispatcher.h"
-#include "TAOC.h"
+#include "Messaging_SyncScopeC.h"
 #include "operation_details.h"
 #include "target_specification.h"
 
@@ -171,7 +171,7 @@ public:
   CORBA::Boolean received_location_forward (void) const;
 
   /// Accessor for the stub associated with this invocation.
-  TAO_Stub * stub(void);
+  TAO_Stub * stub (void);
 
   /// Return the TAO_Transport in use for the current Invocation
   /// object.
@@ -201,11 +201,6 @@ public:
 
 protected:
 
-  //  int valid_end_point_found_;
-  //  int client_protocol_index
-
-protected:
-
   /// Sends the request, does not wait for the response.
   /**
    * Returns TAO_INVOKE_RESTART if the write call failed and the
@@ -247,7 +242,6 @@ protected:
                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-
 protected:
 
   /// The object on which this invocation is going.
@@ -462,12 +456,12 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Accessor for private member.
-  TAO::SyncScope sync_scope (void);
+  Messaging::SyncScope sync_scope (void);
 
 private:
 
   /// Our sync scope.
-  TAO::SyncScope sync_scope_;
+  Messaging::SyncScope sync_scope_;
 };
 
 // ****************************************************************
diff --git a/TAO/tao/Invocation.i b/TAO/tao/Invocation.i
index 64ad12a8b4c..65b603408b0 100644
--- a/TAO/tao/Invocation.i
+++ b/TAO/tao/Invocation.i
@@ -193,7 +193,7 @@ TAO_GIOP_Oneway_Invocation::~TAO_GIOP_Oneway_Invocation (void)
 {
 }
 
-ACE_INLINE TAO::SyncScope
+ACE_INLINE Messaging::SyncScope
 TAO_GIOP_Oneway_Invocation::sync_scope (void)
 {
   return this->sync_scope_;
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index 4e19951f122..425c025855a 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -1,4 +1,3 @@
-
 #----------------------------------------------------------------------------
 #
 #      $Id$
@@ -190,6 +189,7 @@ ORB_CORE_FILES = \
   Object_KeyC \
   Protocols_Hooks \
   Default_Protocols_Hooks \
+  Messaging_SyncScopeC \
   Invocation \
   Invocation_Endpoint_Selectors \
   Asynch_Invocation \
@@ -342,8 +342,7 @@ DIRS += \
 ORB_CORE_FILES += \
   Policy_Manager \
   Buffering_Constraint_Policy \
-  Messaging_PolicyValueC \
-  Messaging_SyncScopeC
+  Messaging_PolicyValueC
 
 endif # corba_messaging
 
@@ -634,8 +633,7 @@ realclean:
  Typecode.h \
  Typecode.i \
  Any.i \
- IOPC.i \
- Transport_Acceptor.inl
+ IOPC.i Transport_Acceptor.inl
 
 .obj/Transport_Connector.o .obj/Transport_Connector.so .shobj/Transport_Connector.o .shobj/Transport_Connector.so: Transport_Connector.cpp Transport_Connector.h \
  $(ACE_ROOT)/ace/pre.h corbafwd.h \
@@ -731,9 +729,8 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- Transport_Connector.inl Transport.h Exception.h \
- corbafwd.h \
+ corbafwd.i Transport_Connector.inl \
+ Transport.h Exception.h corbafwd.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
  $(ACE_ROOT)/ace/String_Base_Const.h \
@@ -813,17 +810,13 @@ realclean:
  IOPC.i \
  Pluggable_Messaging_Utils.i \
  Incoming_Message_Queue.inl Transport.inl ORB_Core.h ORB.h Services.h \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- PolicyC.h CurrentC.h \
- CurrentC.i \
+ Services.i CORBA_String.h \
+ CORBA_String.inl PolicyC.h \
+ CurrentC.h CurrentC.i \
  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
@@ -832,11 +825,9 @@ realclean:
  Policy_Manager.i \
  Resource_Factory.h params.h \
  CORBA_String.h \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -844,30 +835,27 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
- DynamicC.h DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h \
- Sequence.h OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
+ DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h \
+ OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
  ValueBase.i \
- ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Messaging_SyncScopeC.i PortableInterceptorC.i \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
  Parser_Registry.i \
  Service_Callbacks.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
  $(ACE_ROOT)/ace/Array_Base.cpp \
  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
- Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ Protocols_Hooks.h $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -877,33 +865,27 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i Invocation.h CDR.h Synch_Reply_Dispatcher.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
+ Invocation.h CDR.h Synch_Reply_Dispatcher.h \
  Reply_Dispatcher.h \
  Reply_Dispatcher.i \
  LF_Event.h \
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i TAOC.i \
  operation_details.h Service_Context.h \
  Service_Context.inl \
  target_specification.h \
  Object_KeyC.h \
  Object_KeyC.i \
  target_specification.i operation_details.i Invocation.i MProfile.h \
- MProfile.i \
- Profile.h Tagged_Components.h \
- CONV_FRAMEC.h \
+ MProfile.i Profile.h \
+ Tagged_Components.h CONV_FRAMEC.h \
  CONV_FRAMEC.i \
  Tagged_Components.i \
  GIOP_Message_Version.h Profile.i Thread_Lane_Resources.h \
- Thread_Lane_Resources.i \
- debug.h Connect_Strategy.h Client_Strategy_Factory.h
+ Thread_Lane_Resources.i debug.h \
+ Connect_Strategy.h Client_Strategy_Factory.h
 
 .obj/Transport.o .obj/Transport.so .shobj/Transport.o .shobj/Transport.so: Transport.cpp Transport.h \
  $(ACE_ROOT)/ace/pre.h corbafwd.h \
@@ -999,8 +981,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- Exception.h \
+ corbafwd.i Exception.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
@@ -1081,17 +1062,13 @@ realclean:
  IOPC.i \
  Pluggable_Messaging_Utils.i \
  Incoming_Message_Queue.inl Transport.inl ORB_Core.h ORB.h Services.h \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- PolicyC.h CurrentC.h \
- CurrentC.i \
+ Services.i CORBA_String.h \
+ CORBA_String.inl PolicyC.h \
+ CurrentC.h CurrentC.i \
  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
@@ -1100,11 +1077,9 @@ realclean:
  Policy_Manager.i \
  Resource_Factory.h params.h \
  CORBA_String.h \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -1112,30 +1087,27 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
- DynamicC.h DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h \
- Sequence.h OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
+ DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h \
+ OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
  ValueBase.i \
- ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Messaging_SyncScopeC.i PortableInterceptorC.i \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
  Parser_Registry.i \
  Service_Callbacks.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
  $(ACE_ROOT)/ace/Array_Base.cpp \
  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
- Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ Protocols_Hooks.h $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -1145,15 +1117,14 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i Client_Strategy_Factory.h Wait_Strategy.h \
- Wait_Strategy.inl Transport_Mux_Strategy.h Stub.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
+ Client_Strategy_Factory.h Wait_Strategy.h Wait_Strategy.inl \
+ Transport_Mux_Strategy.h Stub.h \
  MProfile.h \
  MProfile.i \
  ORB.h \
  ORB_Core.h \
- Stub.i \
- Sync_Strategies.h \
+ Stub.i Sync_Strategies.h \
  Transport.h \
  TAOC.h \
  TimeBaseC.h \
@@ -1163,7 +1134,7 @@ realclean:
  TimeBaseC.i \
  TAOC.i \
  Sync_Strategies.i \
- Connection_Handler.h \
+ Connection_Handler.h LF_Event.h LF_Event.inl \
  $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -1174,17 +1145,14 @@ realclean:
  Pluggable_Messaging.h \
  Pluggable_Messaging_Utils.h \
  Pluggable_Messaging.i \
- Synch_Queued_Message.h Queued_Message.h LF_Event.h LF_Event.inl \
- Queued_Message.inl Asynch_Queued_Message.h Flushing_Strategy.h \
- Thread_Lane_Resources.h \
- Thread_Lane_Resources.i \
- debug.h Resume_Handle.h Resume_Handle.inl
+ Synch_Queued_Message.h Queued_Message.h Queued_Message.inl \
+ Asynch_Queued_Message.h Flushing_Strategy.h Thread_Lane_Resources.h \
+ Thread_Lane_Resources.i debug.h \
+ Resume_Handle.h Resume_Handle.inl
 
 .obj/Incoming_Message_Queue.o .obj/Incoming_Message_Queue.so .shobj/Incoming_Message_Queue.o .shobj/Incoming_Message_Queue.so: Incoming_Message_Queue.cpp \
- Incoming_Message_Queue.h \
- $(ACE_ROOT)/ace/pre.h \
- Pluggable_Messaging_Utils.h \
- IOPC.h \
+ Incoming_Message_Queue.h $(ACE_ROOT)/ace/pre.h \
+ Pluggable_Messaging_Utils.h IOPC.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -1314,39 +1282,30 @@ realclean:
  IOPC.i \
  Pluggable_Messaging_Utils.i \
  Incoming_Message_Queue.inl ORB_Core.h corbafwd.h ORB.h Exception.h \
- Services.h \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- PolicyC.h CurrentC.h \
- CurrentC.i \
+ Services.h Services.i \
+ CORBA_String.h CORBA_String.inl \
+ PolicyC.h CurrentC.h CurrentC.i \
  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
  LocalObject.i \
  debug.h \
  Policy_Manager.i \
- Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
+ Resource_Factory.h $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- params.h \
+ $(ACE_ROOT)/ace/Service_Object.i params.h \
  CORBA_String.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -1354,14 +1313,13 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
  TAO_Export.h DynamicC.h DynamicC.i ObjectReferenceTemplateC.h \
  OctetSeqC.h Sequence.h OctetSeqC.i StringSeqC.h StringSeqC.i \
- ValueBase.h \
- ValueBase.i \
- ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Messaging_SyncScopeC.i PortableInterceptorC.i \
+ ValueBase.h ValueBase.i \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -1379,15 +1337,13 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Parser_Registry.h \
  Parser_Registry.i \
  Service_Callbacks.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
  $(ACE_ROOT)/ace/Array_Base.cpp \
  Cleanup_Func_Registry.inl Object_Ref_Table.h \
@@ -1411,16 +1367,14 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i debug.h
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i debug.h
 
 .obj/Resume_Handle.o .obj/Resume_Handle.so .shobj/Resume_Handle.o .shobj/Resume_Handle.so: Resume_Handle.cpp Resume_Handle.h \
  $(ACE_ROOT)/ace/pre.h TAO_Export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- Resume_Handle.inl ORB_Core.h corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl Resume_Handle.inl \
+ ORB_Core.h corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1509,8 +1463,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i ORB.h \
- Exception.h \
+ corbafwd.i ORB.h Exception.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
@@ -1521,8 +1474,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Services.h \
+ Exception.i Services.h \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -1532,11 +1484,9 @@ realclean:
  Sequence_T.cpp \
  Environment.h \
  Environment.i \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- PolicyC.h CurrentC.h \
- Object.h \
+ Services.i CORBA_String.h \
+ CORBA_String.inl PolicyC.h \
+ CurrentC.h Object.h \
  Policy_ForwardC.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -1544,34 +1494,28 @@ realclean:
  CDR.i \
  Policy_ForwardC.i \
  Object.i \
- CurrentC.i \
- Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ CurrentC.i Policy_ForwardC.h \
+ Remote_Object_Proxy_Impl.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
  LocalObject.i \
  debug.h \
  Policy_Manager.i \
- Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
+ Resource_Factory.h $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- params.h \
+ $(ACE_ROOT)/ace/Service_Object.i params.h \
  CORBA_String.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -1579,10 +1523,9 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h \
- Exception.h \
- Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Exception.h Adapter.i \
+ PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
  Any.h \
  Typecode.h \
  Typecode.i \
@@ -1590,9 +1533,9 @@ realclean:
  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
  StringSeqC.h StringSeqC.i ValueBase.h \
  ValueBase.i \
- ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h Object.h \
- Any.h IOPC.i Messaging_SyncScopeC.i PortableInterceptorC.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i \
+ PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Service_Config.h \
@@ -1609,16 +1552,13 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Parser_Registry.h \
  Parser_Registry.i \
- Service_Callbacks.h \
- IOPC.h \
+ Service_Callbacks.h IOPC.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
  $(ACE_ROOT)/ace/Array_Base.cpp \
  Cleanup_Func_Registry.inl Object_Ref_Table.h \
@@ -1642,12 +1582,10 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i
 
-.obj/Profile.o .obj/Profile.so .shobj/Profile.o .shobj/Profile.so: Profile.cpp Profile.h \
- $(ACE_ROOT)/ace/pre.h corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
+.obj/Profile.o .obj/Profile.so .shobj/Profile.o .shobj/Profile.so: Profile.cpp Profile.h $(ACE_ROOT)/ace/pre.h \
+ corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -1739,8 +1677,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- Tagged_Components.h \
+ corbafwd.i Tagged_Components.h \
  IOPC.h \
  corbafwd.h \
  Exception.h \
@@ -1778,15 +1715,13 @@ realclean:
  IOPC.i \
  CONV_FRAMEC.h \
  CONV_FRAMEC.i \
- Tagged_Components.i \
- PolicyC.h CurrentC.h \
- CurrentC.i \
+ Tagged_Components.i PolicyC.h \
+ CurrentC.h CurrentC.i \
  Policy_ForwardC.h Exception.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i GIOP_Message_Version.h \
- GIOP_Message_Version.inl \
- Profile.i Object_KeyC.h \
- Object_KeyC.i \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i GIOP_Message_Version.h \
+ GIOP_Message_Version.inl Profile.i \
+ Object_KeyC.h Object_KeyC.i \
  Messaging_PolicyValueC.h IOPC.h Sequence.h Messaging_PolicyValueC.i \
  Stub.h MProfile.h \
  PolicyC.h \
@@ -1903,8 +1838,7 @@ realclean:
  Object_KeyC.h \
  target_specification.i
 
-.obj/Endpoint.o .obj/Endpoint.so .shobj/Endpoint.o .shobj/Endpoint.so: Endpoint.cpp \
- Endpoint.h \
+.obj/Endpoint.o .obj/Endpoint.so .shobj/Endpoint.o .shobj/Endpoint.so: Endpoint.cpp Endpoint.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -2190,9 +2124,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -2263,24 +2197,24 @@ realclean:
  Transport_Descriptor_Interface.h \
  Transport_Descriptor_Interface.inl
 
-.obj/Connection_Handler.o .obj/Connection_Handler.so .shobj/Connection_Handler.o .shobj/Connection_Handler.so: Connection_Handler.cpp \
- Connection_Handler.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
+.obj/Connection_Handler.o .obj/Connection_Handler.so .shobj/Connection_Handler.o .shobj/Connection_Handler.so: Connection_Handler.cpp Connection_Handler.h \
+ $(ACE_ROOT)/ace/pre.h LF_Event.h corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/OS_Dirent.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
  $(ACE_ROOT)/ace/OS_Dirent.inl \
  $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/OS_String.inl \
  $(ACE_ROOT)/ace/OS_Memory.h \
  $(ACE_ROOT)/ace/OS_Memory.inl \
@@ -2305,15 +2239,6 @@ realclean:
  $(ACE_ROOT)/ace/Sock_Connect.h \
  $(ACE_ROOT)/ace/Sock_Connect.i \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- Transport.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
@@ -2366,8 +2291,15 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- Exception.h \
+ corbafwd.i LF_Event.inl \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ Connection_Handler.inl ORB_Core.h \
+ ORB.h Exception.h corbafwd.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
  $(ACE_ROOT)/ace/String_Base_Const.h \
@@ -2377,53 +2309,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Transport_Descriptor_Interface.h \
- Transport_Descriptor_Interface.inl \
- Transport_Cache_Manager.h \
- Cache_Entries.h \
- $(ACE_ROOT)/ace/Recyclable.h \
- $(ACE_ROOT)/ace/Recyclable.inl \
- Cache_Entries.inl \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Transport_Cache_Manager.inl \
- Transport_Timer.h \
- $(ACE_ROOT)/ace/Refcountable.h \
- $(ACE_ROOT)/ace/Refcountable.inl \
- Incoming_Message_Queue.h \
- Pluggable_Messaging_Utils.h \
- IOPC.h \
- Object.h \
- Policy_ForwardC.h \
+ Exception.i Services.h \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -2433,92 +2319,94 @@ realclean:
  Sequence_T.cpp \
  Environment.h \
  Environment.i \
+ Services.i CORBA_String.h \
+ CORBA_String.inl PolicyC.h \
+ CurrentC.h Object.h \
+ Policy_ForwardC.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
  Policy_ForwardC.i \
  Object.i \
- Any.h \
- Typecode.h \
- Typecode.i \
- Any.i \
- IOPC.i \
- Pluggable_Messaging_Utils.i \
- Incoming_Message_Queue.inl \
- Transport.inl \
- Connection_Handler.inl \
- ORB_Core.h \
- ORB.h \
- Services.h \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- PolicyC.h \
- CurrentC.h \
- CurrentC.i \
+ CurrentC.i Policy_ForwardC.h \
  Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h \
- PolicyC.i \
- ORB.i \
- Policy_Manager.h \
- Policy_Set.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
+ PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
  LocalObject.i \
  debug.h \
  Policy_Manager.i \
- Resource_Factory.h \
- params.h \
- params.i \
- TAO_Singleton_Manager.h \
+ Resource_Factory.h $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i params.h \
+ CORBA_String.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- Adapter.h \
- Adapter.i \
- PolicyFactory_Registry.h \
- PortableInterceptorC.h \
- DynamicC.h \
- DynamicC.i \
- ObjectReferenceTemplateC.h \
- OctetSeqC.h \
- OctetSeqC.i \
- StringSeqC.h \
- StringSeqC.i \
- ValueBase.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Exception.h Adapter.i \
+ PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h \
+ DynamicC.h Any.h \
+ Typecode.h \
+ Typecode.i \
+ Any.i DynamicC.i \
+ ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
+ StringSeqC.h StringSeqC.i ValueBase.h \
  ValueBase.i \
- ObjectReferenceTemplateC.i \
- Messaging_SyncScopeC.h \
- Messaging_SyncScopeC.i \
- PortableInterceptorC.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i \
+ PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Parser_Registry.h \
  Parser_Registry.i \
- Service_Callbacks.h \
+ Service_Callbacks.h IOPC.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
  $(ACE_ROOT)/ace/Array_Base.cpp \
- Cleanup_Func_Registry.inl \
- Object_Ref_Table.h \
- Interceptor_List.h \
- Interceptor_List.inl \
- PICurrent.h \
- PICurrent.inl \
- Protocols_Hooks.h \
+ Cleanup_Func_Registry.inl Object_Ref_Table.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+ PICurrent.inl Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Containers.h \
@@ -2529,10 +2417,22 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i \
- Server_Strategy_Factory.h \
- Resume_Handle.h TAO_Export.h Resume_Handle.inl
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
+ Server_Strategy_Factory.h debug.h Resume_Handle.h Resume_Handle.inl \
+ Transport.h Transport_Descriptor_Interface.h \
+ Transport_Descriptor_Interface.inl \
+ Transport_Cache_Manager.h \
+ Cache_Entries.h \
+ Transport_Descriptor_Interface.h \
+ $(ACE_ROOT)/ace/Recyclable.h \
+ $(ACE_ROOT)/ace/Recyclable.inl \
+ Cache_Entries.inl \
+ Transport_Cache_Manager.inl \
+ Transport_Timer.h $(ACE_ROOT)/ace/Refcountable.h \
+ $(ACE_ROOT)/ace/Refcountable.inl \
+ Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
+ Pluggable_Messaging_Utils.i \
+ Incoming_Message_Queue.inl Transport.inl
 
 .obj/Acceptor_Registry.o .obj/Acceptor_Registry.so .shobj/Acceptor_Registry.o .shobj/Acceptor_Registry.so: Acceptor_Registry.cpp \
  Acceptor_Registry.h \
@@ -3138,8 +3038,7 @@ realclean:
  Exception.h \
  Exception.i \
  Typecode.i \
- Any.i \
- iiop_endpoints.i
+ Any.i iiop_endpoints.i
 
 .obj/IIOP_Factory.o .obj/IIOP_Factory.so .shobj/IIOP_Factory.o .shobj/IIOP_Factory.so: IIOP_Factory.cpp \
  IIOP_Factory.h \
@@ -3370,12 +3269,16 @@ realclean:
  Wait_Strategy.h \
  Wait_Strategy.inl \
  Connection_Handler.h \
+ LF_Event.h \
+ LF_Event.inl \
  $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SOCK.i \
+ Connection_Handler.inl \
+ IIOP_Transport.h \
  Transport.h \
  Transport_Descriptor_Interface.h \
  Transport_Descriptor_Interface.inl \
@@ -3389,8 +3292,6 @@ realclean:
  Pluggable_Messaging_Utils.i \
  Incoming_Message_Queue.inl \
  Transport.inl \
- Connection_Handler.inl \
- IIOP_Transport.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK_IO.i \
@@ -3722,12 +3623,16 @@ realclean:
  Wait_Strategy.h \
  Wait_Strategy.inl \
  Connection_Handler.h \
+ LF_Event.h \
+ LF_Event.inl \
  $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SOCK.i \
+ Connection_Handler.inl \
+ IIOP_Transport.h \
  Transport.h \
  Transport_Descriptor_Interface.h \
  Transport_Descriptor_Interface.inl \
@@ -3741,8 +3646,6 @@ realclean:
  Pluggable_Messaging_Utils.i \
  Incoming_Message_Queue.inl \
  Transport.inl \
- Connection_Handler.inl \
- IIOP_Transport.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK_IO.i \
@@ -4012,28 +3915,24 @@ realclean:
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/INET_Addr.i \
  IIOP_Endpoint.i \
- IIOP_Profile.i \
- CDR.h Environment.h ORB.h ORB_Core.h corbafwd.h Policy_Manager.h \
+ IIOP_Profile.i CDR.h Environment.h \
+ ORB.h ORB_Core.h corbafwd.h Policy_Manager.h \
  Policy_Set.h \
  Policy_Set.i \
  LocalObject.h \
  LocalObject.i \
  debug.h \
  Policy_Manager.i \
- Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
+ Resource_Factory.h $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- params.h \
+ $(ACE_ROOT)/ace/Service_Object.i params.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -4041,14 +3940,14 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
  TAO_Export.h CurrentC.h DynamicC.h DynamicC.i \
  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
  StringSeqC.h StringSeqC.i ValueBase.h \
- ValueBase.i \
- Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Messaging_SyncScopeC.i PolicyC.h PortableInterceptorC.i \
+ ValueBase.i Exception.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h PolicyC.h PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -4066,15 +3965,13 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Parser_Registry.h \
  Parser_Registry.i \
  Service_Callbacks.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
  $(ACE_ROOT)/ace/Array_Base.cpp \
  Cleanup_Func_Registry.inl Object_Ref_Table.h \
@@ -4098,8 +3995,8 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i debug.h iiop_endpoints.h iiop_endpoints.i
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i debug.h \
+ iiop_endpoints.h iiop_endpoints.i
 
 .obj/IIOP_Transport.o .obj/IIOP_Transport.so .shobj/IIOP_Transport.o .shobj/IIOP_Transport.so: IIOP_Transport.cpp \
  IIOP_Transport.h \
@@ -4354,6 +4251,8 @@ realclean:
  Wait_Strategy.h \
  Wait_Strategy.inl \
  Connection_Handler.h \
+ LF_Event.h \
+ LF_Event.inl \
  Connection_Handler.inl \
  IIOP_Connection_Handler.i \
  IIOP_Acceptor.h \
@@ -4700,16 +4599,14 @@ realclean:
  $(ACE_ROOT)/ace/Service_Types.i \
  $(ACE_ROOT)/ace/Service_Repository.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Connector.cpp \
- Transport_Connector.h corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Connector.cpp Transport_Connector.h \
+ corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/CDR_Base.inl \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- Transport_Connector.inl \
+ corbafwd.i Transport_Connector.inl \
  Connector_Impl.h \
  corbafwd.h \
  Connector_Impl.inl \
@@ -4720,6 +4617,10 @@ realclean:
  Wait_Strategy.h \
  Wait_Strategy.inl \
  Connection_Handler.h \
+ LF_Event.h \
+ LF_Event.inl \
+ Connection_Handler.inl \
+ IIOP_Transport.h \
  Transport.h \
  Exception.h \
  Exception.i \
@@ -4758,14 +4659,11 @@ realclean:
  Pluggable_Messaging_Utils.i \
  Incoming_Message_Queue.inl \
  Transport.inl \
- Connection_Handler.inl \
- IIOP_Transport.h \
  IIOPC.h \
  IIOPC.i \
  IIOP_Transport.i \
  IIOP_Connection_Handler.i \
- IIOP_Profile.h \
- Profile.h \
+ IIOP_Profile.h Profile.h \
  Tagged_Components.h \
  CONV_FRAMEC.h \
  CONV_FRAMEC.i \
@@ -4792,8 +4690,8 @@ realclean:
  CORBA_String.inl \
  ORB.i \
  IIOP_Endpoint.i \
- IIOP_Profile.i \
- debug.h ORB_Core.h ORB.h Environment.h Policy_Manager.h \
+ IIOP_Profile.i debug.h ORB_Core.h \
+ ORB.h Environment.h Policy_Manager.h \
  Policy_Set.h \
  Policy_Set.i \
  LocalObject.h \
@@ -4801,21 +4699,19 @@ realclean:
  debug.h \
  Policy_Manager.i \
  Resource_Factory.h params.h \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
- TAO_Singleton_Manager.h \
- Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
  TAO_Export.h CurrentC.h DynamicC.h DynamicC.i \
  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
  StringSeqC.h StringSeqC.i ValueBase.h \
- ValueBase.i \
- Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Messaging_SyncScopeC.i PolicyC.h PortableInterceptorC.i \
+ ValueBase.i Exception.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h PolicyC.h PortableInterceptorC.i \
  Parser_Registry.h \
  Parser_Registry.i \
  Service_Callbacks.h \
@@ -4830,13 +4726,6 @@ realclean:
  Transport_Cache_Manager.h Invocation.h CDR.h Synch_Reply_Dispatcher.h \
  Reply_Dispatcher.h \
  Reply_Dispatcher.i \
- LF_Event.h \
- LF_Event.inl \
- TAOC.h TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i TAOC.i \
  operation_details.h Service_Context.h \
  Service_Context.inl \
  target_specification.h target_specification.i operation_details.i \
@@ -5070,12 +4959,16 @@ realclean:
  Wait_Strategy.h \
  Wait_Strategy.inl \
  Connection_Handler.h \
+ LF_Event.h \
+ LF_Event.inl \
  $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SOCK.i \
+ Connection_Handler.inl \
+ IIOP_Transport.h \
  Transport.h \
  Transport_Descriptor_Interface.h \
  Transport_Descriptor_Interface.inl \
@@ -5089,8 +4982,6 @@ realclean:
  Pluggable_Messaging_Utils.i \
  Incoming_Message_Queue.inl \
  Transport.inl \
- Connection_Handler.inl \
- IIOP_Transport.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK_IO.i \
@@ -5396,12 +5287,16 @@ realclean:
  Wait_Strategy.h \
  Wait_Strategy.inl \
  Connection_Handler.h \
+ LF_Event.h \
+ LF_Event.inl \
  $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SOCK.i \
+ Connection_Handler.inl \
+ IIOP_Transport.h \
  Transport.h \
  Exception.h \
  Exception.i \
@@ -5440,8 +5335,6 @@ realclean:
  Pluggable_Messaging_Utils.i \
  Incoming_Message_Queue.inl \
  Transport.inl \
- Connection_Handler.inl \
- IIOP_Transport.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK_IO.i \
@@ -5677,8 +5570,7 @@ realclean:
  IIOP_Endpoint.i \
  debug.h
 
-.obj/IIOPC.o .obj/IIOPC.so .shobj/IIOPC.o .shobj/IIOPC.so: IIOPC.cpp \
- IIOPC.h \
+.obj/IIOPC.o .obj/IIOPC.so .shobj/IIOPC.o .shobj/IIOPC.so: IIOPC.cpp IIOPC.h \
  $(ACE_ROOT)/ace/pre.h \
  TAO_Export.h \
  $(ACE_ROOT)/ace/post.h \
@@ -5924,9 +5816,8 @@ realclean:
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- default_client.i \
- ORB_Core.h corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
+ default_client.i ORB_Core.h \
+ corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
@@ -5936,11 +5827,9 @@ realclean:
  $(ACE_ROOT)/ace/CORBA_macros.h \
  orbconf.h \
  varbase.h \
- corbafwd.i ORB.h \
- Exception.h \
+ corbafwd.i ORB.h Exception.h \
  corbafwd.h \
- Exception.i \
- Services.h \
+ Exception.i Services.h \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -5950,11 +5839,9 @@ realclean:
  Sequence_T.cpp \
  Environment.h \
  Environment.i \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- PolicyC.h CurrentC.h \
- Object.h \
+ Services.i CORBA_String.h \
+ CORBA_String.inl PolicyC.h \
+ CurrentC.h Object.h \
  Policy_ForwardC.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -5962,13 +5849,11 @@ realclean:
  CDR.i \
  Policy_ForwardC.i \
  Object.i \
- CurrentC.i \
- Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ CurrentC.i Policy_ForwardC.h \
+ Remote_Object_Proxy_Impl.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
@@ -5977,11 +5862,9 @@ realclean:
  Policy_Manager.i \
  Resource_Factory.h params.h \
  CORBA_String.h \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -5989,32 +5872,27 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h \
- Exception.h \
- Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
- TAO_Export.h DynamicC.h \
- Any.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Exception.h Adapter.i \
+ PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h \
+ DynamicC.h Any.h \
  Typecode.h \
  Typecode.i \
  Any.i DynamicC.i \
  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
  StringSeqC.h StringSeqC.i ValueBase.h \
  ValueBase.i \
- ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h Object.h \
- Any.h IOPC.i Messaging_SyncScopeC.i PortableInterceptorC.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i \
+ PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
  Parser_Registry.i \
- Service_Callbacks.h \
- IOPC.h \
+ Service_Callbacks.h IOPC.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
  $(ACE_ROOT)/ace/Array_Base.cpp \
  Cleanup_Func_Registry.inl Object_Ref_Table.h \
@@ -6038,14 +5916,13 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i Wait_On_Read.h \
- Wait_Strategy.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
+ Wait_On_Read.h Wait_Strategy.h \
  Wait_Strategy.inl \
  Wait_On_Reactor.h Wait_On_Leader_Follower.h Exclusive_TMS.h \
  Transport_Mux_Strategy.h \
  Muxed_TMS.h Blocked_Connect_Strategy.h Connect_Strategy.h \
- Reactive_Connect_Strategy.h
+ Reactive_Connect_Strategy.h LF_Connect_Strategy.h
 
 .obj/default_server.o .obj/default_server.so .shobj/default_server.o .shobj/default_server.so: default_server.cpp \
  default_server.h \
@@ -6249,9 +6126,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -6495,9 +6372,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -6830,8 +6707,7 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  default_resource.i
 
-.obj/append.o .obj/append.so .shobj/append.o .shobj/append.so: append.cpp \
- Marshal.h \
+.obj/append.o .obj/append.so .shobj/append.o .shobj/append.so: append.cpp Marshal.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -6981,8 +6857,7 @@ realclean:
  ValueBase.i \
  debug.h
 
-.obj/Marshal.o .obj/Marshal.so .shobj/Marshal.o .shobj/Marshal.so: Marshal.cpp \
- Marshal.h \
+.obj/Marshal.o .obj/Marshal.so .shobj/Marshal.o .shobj/Marshal.so: Marshal.cpp Marshal.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -7129,8 +7004,7 @@ realclean:
  ORB.i \
  Marshal.i
 
-.obj/skip.o .obj/skip.so .shobj/skip.o .shobj/skip.so: skip.cpp \
- Marshal.h \
+.obj/skip.o .obj/skip.so .shobj/skip.o .shobj/skip.so: skip.cpp Marshal.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -7418,8 +7292,7 @@ realclean:
  PolicyC.i \
  ORB.i
 
-.obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp \
- Any.h \
+.obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp Any.h \
  $(ACE_ROOT)/ace/pre.h \
  CDR.h \
  corbafwd.h \
@@ -7606,9 +7479,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -7765,8 +7638,7 @@ realclean:
  corbafwd.i \
  CORBA_String.inl
 
-.obj/CurrentC.o .obj/CurrentC.so .shobj/CurrentC.o .shobj/CurrentC.so: CurrentC.cpp \
- CurrentC.h \
+.obj/CurrentC.o .obj/CurrentC.so .shobj/CurrentC.o .shobj/CurrentC.so: CurrentC.cpp CurrentC.h \
  $(ACE_ROOT)/ace/pre.h \
  Object.h \
  corbafwd.h \
@@ -7890,8 +7762,7 @@ realclean:
  Object.i \
  CurrentC.i
 
-.obj/Exception.o .obj/Exception.so .shobj/Exception.o .shobj/Exception.so: Exception.cpp \
- $(ACE_ROOT)/ace/streams.h \
+.obj/Exception.o .obj/Exception.so .shobj/Exception.o .shobj/Exception.so: Exception.cpp $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
@@ -8078,9 +7949,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -8250,8 +8121,7 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i TAO_Export.h \
- WrongTransactionC.i \
- Stub.h \
+ WrongTransactionC.i Stub.h \
  MProfile.h \
  PolicyC.h \
  CurrentC.h \
@@ -8327,9 +8197,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -8395,13 +8265,6 @@ realclean:
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i \
- TAOC.i \
  operation_details.h \
  Service_Context.h \
  Service_Context.inl \
@@ -8602,9 +8465,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -8662,8 +8525,7 @@ realclean:
  $(ACE_ROOT)/ace/Thread_Manager.i \
  ORB_Core.i
 
-.obj/Object.o .obj/Object.so .shobj/Object.o .shobj/Object.so: Object.cpp \
- Object.h \
+.obj/Object.o .obj/Object.so .shobj/Object.o .shobj/Object.so: Object.cpp Object.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -8849,9 +8711,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -8923,13 +8785,6 @@ realclean:
  Reply_Dispatcher.i \
  LF_Event.h \
  LF_Event.inl \
- TAOC.h \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i \
- TAOC.i \
  operation_details.h \
  Service_Context.h \
  Service_Context.inl \
@@ -9072,15 +8927,13 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
  Policy_ForwardC.i \
- Object.i \
- LocalObject.i PolicyC.h CurrentC.h \
- Object.h \
- CurrentC.i \
- Policy_ForwardC.h Exception.h \
- Exception.i \
+ Object.i LocalObject.i PolicyC.h \
+ CurrentC.h Object.h \
+ CurrentC.i Policy_ForwardC.h \
+ Exception.h Exception.i \
  Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i
 
 .obj/ObjectIDList.o .obj/ObjectIDList.so .shobj/ObjectIDList.o .shobj/ObjectIDList.so: ObjectIDList.cpp \
  ObjectIDList.h \
@@ -9226,8 +9079,7 @@ realclean:
  Any.h \
  Any.i
 
-.obj/ORB.o .obj/ORB.so .shobj/ORB.o .shobj/ORB.so: ORB.cpp ORB.h \
- $(ACE_ROOT)/ace/pre.h corbafwd.h \
+.obj/ORB.o .obj/ORB.so .shobj/ORB.o .shobj/ORB.so: ORB.cpp ORB.h $(ACE_ROOT)/ace/pre.h corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
@@ -9320,8 +9172,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- Exception.h \
+ corbafwd.i Exception.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
@@ -9332,8 +9183,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Services.h \
+ Exception.i Services.h \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -9343,11 +9193,9 @@ realclean:
  Sequence_T.cpp \
  Environment.h \
  Environment.i \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- PolicyC.h CurrentC.h \
- Object.h \
+ Services.i CORBA_String.h \
+ CORBA_String.inl PolicyC.h \
+ CurrentC.h Object.h \
  Policy_ForwardC.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -9355,21 +9203,10 @@ realclean:
  CDR.i \
  Policy_ForwardC.i \
  Object.i \
- CurrentC.i \
- Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i \
- ORB.i ORB_Table.h \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
+ CurrentC.i Policy_ForwardC.h \
+ Remote_Object_Proxy_Impl.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i ORB.i ORB_Table.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -9400,17 +9237,13 @@ realclean:
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- ORB_Table.inl \
- Connector_Registry.h Endpoint.h \
- Endpoint.i \
- Connector_Registry.i \
- IOR_Parser.h \
+ ORB_Table.inl Connector_Registry.h \
+ Endpoint.h Endpoint.i \
+ Connector_Registry.i IOR_Parser.h \
  Exception.h \
- IOR_Parser.i \
- Parser_Registry.h \
- Parser_Registry.i \
- Object.h Typecode.h \
- Typecode.i Stub.h \
+ IOR_Parser.i Parser_Registry.h \
+ Parser_Registry.i Object.h \
+ Typecode.h Typecode.i Stub.h \
  MProfile.h \
  PolicyC.h \
  MProfile.i \
@@ -9427,6 +9260,16 @@ realclean:
  params.h \
  CORBA_String.h \
  params.i \
+ TAO_Singleton_Manager.h \
+ TAO_Singleton_Manager.inl \
+ TAO_Singleton.h \
+ TAO_Singleton.inl \
+ TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  Adapter.h \
  Adapter.i \
  PolicyFactory_Registry.h \
@@ -9446,9 +9289,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -9481,23 +9324,20 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  ORB_Core.i \
- Stub.i ORB_Core.h \
- debug.h TAO_Internal.h TAO_Export.h NVList.h \
- NVList.i \
- Dynamic_Adapter.h CDR.h MProfile.h Profile.h Tagged_Components.h \
+ Stub.i ORB_Core.h debug.h \
+ TAO_Internal.h TAO_Export.h NVList.h \
+ NVList.i Dynamic_Adapter.h CDR.h \
+ MProfile.h Profile.h Tagged_Components.h \
  CONV_FRAMEC.h \
  CONV_FRAMEC.i \
  Tagged_Components.i \
  GIOP_Message_Version.h \
- GIOP_Message_Version.inl \
- Profile.i ORBInitInfo.h PortableInterceptorC.h LocalObject.h \
- StringSeqC.h ORBInitInfo.inl ORBInitializer_Registry.h \
- TAO_Singleton.h \
- ORBInitializer_Registry.inl \
+ GIOP_Message_Version.inl Profile.i \
+ ORBInitInfo.h PortableInterceptorC.h LocalObject.h StringSeqC.h \
+ ORBInitInfo.inl ORBInitializer_Registry.h \
  CodecFactory_ORBInitializer.h TypeCodeFactory_Adapter.h \
  PICurrent_ORBInitializer.h PICurrent.h ValueFactory_Map.h \
- ValueFactory_Map.i \
- Object_KeyC.h \
+ ValueFactory_Map.i Object_KeyC.h \
  Object_KeyC.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
@@ -9529,8 +9369,7 @@ realclean:
  $(ACE_ROOT)/ace/Argv_Type_Converter.h \
  $(ACE_ROOT)/ace/Argv_Type_Converter.inl
 
-.obj/corbafwd.o .obj/corbafwd.so .shobj/corbafwd.o .shobj/corbafwd.so: corbafwd.cpp \
- corbafwd.h \
+.obj/corbafwd.o .obj/corbafwd.so .shobj/corbafwd.o .shobj/corbafwd.so: corbafwd.cpp corbafwd.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -9721,8 +9560,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- Sequence.h \
+ corbafwd.i Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
  Sequence.i \
@@ -9731,8 +9569,8 @@ realclean:
  Sequence_T.i \
  Sequence_T.cpp \
  Environment.h \
- Environment.i \
- CDR.h $(ACE_ROOT)/ace/CDR_Stream.h \
+ Environment.i CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
  $(ACE_ROOT)/ace/String_Base_Const.h \
@@ -9743,8 +9581,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/CDR_Stream.i \
- CDR.i \
- Policy_ForwardC.i \
+ CDR.i Policy_ForwardC.i \
  Stub.h \
  MProfile.h \
  PolicyC.h \
@@ -9814,9 +9651,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -9882,13 +9719,6 @@ realclean:
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i \
- TAOC.i \
  operation_details.h \
  Service_Context.h \
  Service_Context.inl \
@@ -9905,8 +9735,7 @@ realclean:
  ClientInterceptorAdapter.h \
  ClientInterceptorAdapter.inl
 
-.obj/PolicyC.o .obj/PolicyC.so .shobj/PolicyC.o .shobj/PolicyC.so: PolicyC.cpp PolicyC.h \
- $(ACE_ROOT)/ace/pre.h \
+.obj/PolicyC.o .obj/PolicyC.so .shobj/PolicyC.o .shobj/PolicyC.so: PolicyC.cpp PolicyC.h $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -10000,8 +9829,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- CurrentC.h \
+ corbafwd.i CurrentC.h \
  Object.h \
  Policy_ForwardC.h \
  Sequence.h \
@@ -10028,13 +9856,11 @@ realclean:
  CDR.i \
  Policy_ForwardC.i \
  Object.i \
- CurrentC.i \
- Policy_ForwardC.h Exception.h \
- Exception.i \
+ CurrentC.i Policy_ForwardC.h \
+ Exception.h Exception.i \
  Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i \
- Stub.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i Stub.h \
  MProfile.h \
  PolicyC.h \
  MProfile.i \
@@ -10093,9 +9919,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -10161,13 +9987,6 @@ realclean:
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i \
- TAOC.i \
  operation_details.h \
  Service_Context.h \
  Service_Context.inl \
@@ -10303,22 +10122,17 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Policy_ForwardC.i \
- Environment.h ORB_Core.h corbafwd.h ORB.h Exception.h \
- Exception.i \
- Services.h \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- PolicyC.h CurrentC.h \
- Object.h \
+ Policy_ForwardC.i Environment.h \
+ ORB_Core.h corbafwd.h ORB.h Exception.h \
+ Exception.i Services.h \
+ Services.i CORBA_String.h \
+ CORBA_String.inl PolicyC.h \
+ CurrentC.h Object.h \
  Object.i \
- CurrentC.i \
- Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i \
- ORB.i \
- Policy_Manager.h \
+ CurrentC.i Policy_ForwardC.h \
+ Remote_Object_Proxy_Impl.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i ORB.i Policy_Manager.h \
  Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
@@ -10326,21 +10140,17 @@ realclean:
  LocalObject.i \
  debug.h \
  Policy_Manager.i \
- Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
+ Resource_Factory.h $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- params.h \
+ $(ACE_ROOT)/ace/Service_Object.i params.h \
  CORBA_String.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -10348,21 +10158,19 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h \
- Exception.h \
- Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
- TAO_Export.h DynamicC.h \
- Any.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Exception.h Adapter.i \
+ PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h \
+ DynamicC.h Any.h \
  Typecode.h \
  Typecode.i \
  Any.i DynamicC.i \
  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
  StringSeqC.h StringSeqC.i ValueBase.h \
  ValueBase.i \
- ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h Object.h \
- Any.h IOPC.i Messaging_SyncScopeC.i PortableInterceptorC.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i \
+ PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Service_Config.h \
@@ -10379,16 +10187,13 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Parser_Registry.h \
  Parser_Registry.i \
- Service_Callbacks.h \
- IOPC.h \
+ Service_Callbacks.h IOPC.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
  $(ACE_ROOT)/ace/Array_Base.cpp \
  Cleanup_Func_Registry.inl Object_Ref_Table.h \
@@ -10412,8 +10217,7 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i debug.h
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i debug.h
 
 .obj/Encodable.o .obj/Encodable.so .shobj/Encodable.o .shobj/Encodable.so: Encodable.cpp \
  Encodable.h \
@@ -11096,9 +10900,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -11164,13 +10968,6 @@ realclean:
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i \
- TAOC.i \
  operation_details.h \
  Service_Context.h \
  Service_Context.inl \
@@ -11186,8 +10983,7 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.i \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/DomainC.o .obj/DomainC.so .shobj/DomainC.o .shobj/DomainC.so: DomainC.cpp DomainC.h \
- $(ACE_ROOT)/ace/pre.h \
+.obj/DomainC.o .obj/DomainC.so .shobj/DomainC.o .shobj/DomainC.so: DomainC.cpp DomainC.h $(ACE_ROOT)/ace/pre.h \
  corba.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
@@ -11360,12 +11156,11 @@ realclean:
  ObjectReferenceTemplateC.h \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
- PortableInterceptorC.i \
- PolicyC.h Sequence.h DomainC.i \
- Stub.h \
+ PortableInterceptorC.i PolicyC.h \
+ Sequence.h DomainC.i Stub.h \
  MProfile.h \
  MProfile.i \
  ORB_Core.h \
@@ -11458,13 +11253,6 @@ realclean:
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i \
- TAOC.i \
  operation_details.h \
  Service_Context.h \
  Service_Context.inl \
@@ -11674,9 +11462,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -11742,9 +11530,6 @@ realclean:
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h \
- TimeBaseC.h \
- TAOC.i \
  operation_details.h \
  Service_Context.h \
  Service_Context.inl \
@@ -11879,8 +11664,7 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i
 
-.obj/Sequence.o .obj/Sequence.so .shobj/Sequence.o .shobj/Sequence.so: Sequence.cpp \
- Sequence.h \
+.obj/Sequence.o .obj/Sequence.so .shobj/Sequence.o .shobj/Sequence.so: Sequence.cpp Sequence.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -11985,8 +11769,7 @@ realclean:
  Environment.h \
  Environment.i
 
-.obj/MProfile.o .obj/MProfile.so .shobj/MProfile.o .shobj/MProfile.so: MProfile.cpp \
- MProfile.h \
+.obj/MProfile.o .obj/MProfile.so .shobj/MProfile.o .shobj/MProfile.so: MProfile.cpp MProfile.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -12133,8 +11916,7 @@ realclean:
  GIOP_Message_Version.inl \
  Profile.i
 
-.obj/Stub.o .obj/Stub.so .shobj/Stub.o .shobj/Stub.so: Stub.cpp Endpoint.h \
- $(ACE_ROOT)/ace/pre.h \
+.obj/Stub.o .obj/Stub.so .shobj/Stub.o .shobj/Stub.so: Stub.cpp Endpoint.h $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -12320,9 +12102,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -12379,33 +12161,25 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  ORB_Core.i \
- Stub.i Profile.h \
- corbafwd.h Tagged_Components.h \
- CONV_FRAMEC.h \
+ Stub.i Profile.h corbafwd.h \
+ Tagged_Components.h CONV_FRAMEC.h \
  CONV_FRAMEC.i \
- Tagged_Components.i \
- PolicyC.h GIOP_Message_Version.h \
- GIOP_Message_Version.inl \
- Profile.i Sequence.h Object.h Invocation.h CDR.h \
- Synch_Reply_Dispatcher.h \
+ Tagged_Components.i PolicyC.h \
+ GIOP_Message_Version.h \
+ GIOP_Message_Version.inl Profile.i \
+ Sequence.h Object.h Invocation.h CDR.h Synch_Reply_Dispatcher.h \
  Reply_Dispatcher.h \
  Reply_Dispatcher.i \
  LF_Event.h \
  LF_Event.inl \
  GIOP_Message_Version.h \
- TAOC.h TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i TAOC.i \
- operation_details.h Service_Context.h \
+ Messaging_SyncScopeC.h operation_details.h Service_Context.h \
  Service_Context.inl \
  target_specification.h \
  Object_KeyC.h \
  Object_KeyC.i \
  target_specification.i operation_details.i Invocation.i \
- Asynch_Invocation.h \
- Invocation.h \
+ Asynch_Invocation.h Invocation.h \
  Asynch_Reply_Dispatcher_Base.h \
  Transport.h \
  Transport_Descriptor_Interface.h \
@@ -12425,16 +12199,21 @@ realclean:
  Incoming_Message_Queue.inl \
  Transport.inl \
  Asynch_Reply_Dispatcher_Base.i \
- Asynch_Invocation.i \
- ORB_Core.h Client_Strategy_Factory.h TAO_Export.h Sync_Strategies.h \
+ Asynch_Invocation.i ORB_Core.h \
+ Client_Strategy_Factory.h TAO_Export.h Sync_Strategies.h \
  TAOC.h \
+ TimeBaseC.h \
+ SmartProxies/Smart_Proxies.h \
+ SmartProxies/smartproxies_export.h \
+ SmartProxies/Smart_Proxies.inl \
+ TimeBaseC.i \
+ TAOC.i \
  Sync_Strategies.i \
  Buffering_Constraint_Policy.h \
  Buffering_Constraint_Policy.i \
  debug.h
 
-.obj/Typecode.o .obj/Typecode.so .shobj/Typecode.o .shobj/Typecode.so: Typecode.cpp \
- Typecode.h \
+.obj/Typecode.o .obj/Typecode.so .shobj/Typecode.o .shobj/Typecode.so: Typecode.cpp Typecode.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -12582,8 +12361,7 @@ realclean:
  Marshal.i \
  debug.h
 
-.obj/ValueBase.o .obj/ValueBase.so .shobj/ValueBase.o .shobj/ValueBase.so: ValueBase.cpp \
- CDR.h \
+.obj/ValueBase.o .obj/ValueBase.so .shobj/ValueBase.o .shobj/ValueBase.so: ValueBase.cpp CDR.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -12766,9 +12544,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -13108,8 +12886,7 @@ realclean:
  PolicyC.i \
  ORB.i
 
-.obj/CDR.o .obj/CDR.so .shobj/CDR.o .shobj/CDR.so: CDR.cpp \
- Timeprobe.h \
+.obj/CDR.o .obj/CDR.so .shobj/CDR.o .shobj/CDR.so: CDR.cpp Timeprobe.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
@@ -13294,9 +13071,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -13403,8 +13180,7 @@ realclean:
  $(ACE_ROOT)/ace/Service_Object.i \
  TAO_Export.h
 
-.obj/debug.o .obj/debug.so .shobj/debug.o .shobj/debug.so: debug.cpp \
- debug.h \
+.obj/debug.o .obj/debug.so .shobj/debug.o .shobj/debug.so: debug.cpp debug.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -13716,10 +13492,8 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- Policy_ForwardC.h \
- corbafwd.h \
- Sequence.h \
+ corbafwd.i Policy_ForwardC.h \
+ corbafwd.h Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
  Sequence.i \
@@ -13728,8 +13502,8 @@ realclean:
  Sequence_T.i \
  Sequence_T.cpp \
  Environment.h \
- Environment.i \
- CDR.h $(ACE_ROOT)/ace/CDR_Stream.h \
+ Environment.i CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
  $(ACE_ROOT)/ace/String_Base_Const.h \
@@ -13740,8 +13514,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/CDR_Stream.i \
- CDR.i \
- Policy_ForwardC.i \
+ CDR.i Policy_ForwardC.i \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
@@ -13752,8 +13525,7 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
 .obj/Default_Protocols_Hooks.o .obj/Default_Protocols_Hooks.so .shobj/Default_Protocols_Hooks.o .shobj/Default_Protocols_Hooks.so: Default_Protocols_Hooks.cpp \
- Default_Protocols_Hooks.h \
- $(ACE_ROOT)/ace/pre.h \
+ Default_Protocols_Hooks.h $(ACE_ROOT)/ace/pre.h \
  Protocols_Hooks.h corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -13847,10 +13619,8 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- Policy_ForwardC.h \
- corbafwd.h \
- Sequence.h \
+ corbafwd.i Policy_ForwardC.h \
+ corbafwd.h Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
  Sequence.i \
@@ -13859,8 +13629,8 @@ realclean:
  Sequence_T.i \
  Sequence_T.cpp \
  Environment.h \
- Environment.i \
- CDR.h $(ACE_ROOT)/ace/CDR_Stream.h \
+ Environment.i CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
  $(ACE_ROOT)/ace/String_Base_Const.h \
@@ -13871,8 +13641,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/CDR_Stream.i \
- CDR.i \
- Policy_ForwardC.i \
+ CDR.i Policy_ForwardC.i \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
@@ -13896,21 +13665,128 @@ realclean:
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  Default_Protocols_Hooks.i \
- PolicyC.h CurrentC.h \
- Object.h \
+ PolicyC.h CurrentC.h Object.h \
  Policy_ForwardC.h \
  Object.i \
- CurrentC.i \
- Exception.h \
+ CurrentC.i Exception.h \
  Exception.i \
  Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
  $(ACE_ROOT)/ace/Dynamic_Service.i \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
+.obj/Messaging_SyncScopeC.o .obj/Messaging_SyncScopeC.so .shobj/Messaging_SyncScopeC.o .shobj/Messaging_SyncScopeC.so: Messaging_SyncScopeC.cpp \
+ Messaging_SyncScopeC.h $(ACE_ROOT)/ace/pre.h \
+ corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Time_Value.inl \
+ $(ACE_ROOT)/ace/Default_Constants.h \
+ $(ACE_ROOT)/ace/Global_Macros.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Unbounded_Set.h \
+ $(ACE_ROOT)/ace/Node.h \
+ $(ACE_ROOT)/ace/Node.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Set.inl \
+ $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ orbconf.h \
+ varbase.h \
+ TAO_Export.h \
+ corbafwd.i Messaging_SyncScopeC.i \
+ Typecode.h \
+ Exception.h \
+ corbafwd.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/String_Base.h \
+ $(ACE_ROOT)/ace/String_Base_Const.h \
+ $(ACE_ROOT)/ace/String_Base.i \
+ $(ACE_ROOT)/ace/String_Base.cpp \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
+ Typecode.i
+
 .obj/Invocation.o .obj/Invocation.so .shobj/Invocation.o .shobj/Invocation.so: Invocation.cpp Invocation.h \
  $(ACE_ROOT)/ace/pre.h CDR.h \
  corbafwd.h \
@@ -14018,8 +13894,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/CDR_Stream.i \
- CDR.i \
- Synch_Reply_Dispatcher.h \
+ CDR.i Synch_Reply_Dispatcher.h \
  Reply_Dispatcher.h \
  IOPC.h \
  Exception.h \
@@ -14048,35 +13923,21 @@ realclean:
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h PolicyC.h \
- CurrentC.h \
- CurrentC.i \
- Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h \
- PolicyC.i \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i TAOC.i \
- operation_details.h corbafwd.h Service_Context.h \
+ Messaging_SyncScopeC.h corbafwd.h Messaging_SyncScopeC.i \
+ operation_details.h Service_Context.h \
  Service_Context.inl \
  target_specification.h \
  Object_KeyC.h \
  Object_KeyC.i \
  target_specification.i operation_details.i Invocation.i Stub.h \
  MProfile.h \
+ PolicyC.h \
+ CurrentC.h \
+ CurrentC.i \
+ Remote_Object_Proxy_Impl.h \
+ Object_Proxy_Impl.h \
+ Encodable.h \
+ PolicyC.i \
  MProfile.i \
  ORB.h \
  Services.h \
@@ -14102,6 +13963,16 @@ realclean:
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
  params.i \
+ TAO_Singleton_Manager.h \
+ TAO_Singleton_Manager.inl \
+ TAO_Singleton.h \
+ TAO_Singleton.inl \
+ TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  Adapter.h \
  Adapter.i \
  PolicyFactory_Registry.h \
@@ -14117,7 +13988,6 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -14175,14 +14045,12 @@ realclean:
  $(ACE_ROOT)/ace/Thread_Manager.i \
  ORB_Core.i \
  Stub.i Profile.h \
- Tagged_Components.h \
- CONV_FRAMEC.h \
+ Tagged_Components.h CONV_FRAMEC.h \
  CONV_FRAMEC.i \
- Tagged_Components.i \
- PolicyC.h GIOP_Message_Version.h Profile.i Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- Object_KeyC.h debug.h Transport.h Exception.h \
- Transport_Descriptor_Interface.h \
+ Tagged_Components.i PolicyC.h \
+ GIOP_Message_Version.h Profile.i Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h Object_KeyC.h debug.h \
+ Transport.h Exception.h Transport_Descriptor_Interface.h \
  Transport_Descriptor_Interface.inl \
  Transport_Cache_Manager.h \
  Cache_Entries.h \
@@ -14197,18 +14065,21 @@ realclean:
  Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
  Pluggable_Messaging_Utils.i \
  Incoming_Message_Queue.inl Transport.inl Connector_Registry.h \
- Endpoint.h \
- Endpoint.i \
+ Endpoint.h Endpoint.i \
  Connector_Registry.i \
  Wait_Strategy.h Wait_Strategy.inl Transport_Mux_Strategy.h \
  Bind_Dispatcher_Guard.h \
  Bind_Dispatcher_Guard.i \
  Transport_Mux_Strategy.h \
  Transport_Connector.h Transport_Connector.inl GIOP_Utils.h \
- GIOP_Utils.i \
- ORB_Core.h Endpoint_Selector_Factory.h \
- Invocation_Endpoint_Selectors.h \
- Invocation_Endpoint_Selectors.i
+ GIOP_Utils.i ORB_Core.h \
+ Endpoint_Selector_Factory.h Invocation_Endpoint_Selectors.h \
+ Invocation_Endpoint_Selectors.i \
+ TAOC.h TimeBaseC.h \
+ SmartProxies/Smart_Proxies.h \
+ SmartProxies/smartproxies_export.h \
+ SmartProxies/Smart_Proxies.inl \
+ TimeBaseC.i TAOC.i
 
 .obj/Invocation_Endpoint_Selectors.o .obj/Invocation_Endpoint_Selectors.so .shobj/Invocation_Endpoint_Selectors.o .shobj/Invocation_Endpoint_Selectors.so: Invocation_Endpoint_Selectors.cpp \
  Invocation_Endpoint_Selectors.h \
@@ -14350,30 +14221,8 @@ realclean:
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h \
- PolicyC.h \
- CurrentC.h \
- CurrentC.i \
- Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h \
- PolicyC.i \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i \
- TAOC.i \
+ Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  operation_details.h \
  Service_Context.h \
  Service_Context.inl \
@@ -14385,6 +14234,13 @@ realclean:
  Invocation.i \
  Stub.h \
  MProfile.h \
+ PolicyC.h \
+ CurrentC.h \
+ CurrentC.i \
+ Remote_Object_Proxy_Impl.h \
+ Object_Proxy_Impl.h \
+ Encodable.h \
+ PolicyC.i \
  MProfile.i \
  ORB.h \
  Services.h \
@@ -14410,6 +14266,16 @@ realclean:
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
  params.i \
+ TAO_Singleton_Manager.h \
+ TAO_Singleton_Manager.inl \
+ TAO_Singleton.h \
+ TAO_Singleton.inl \
+ TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  Adapter.h \
  Adapter.i \
  PolicyFactory_Registry.h \
@@ -14424,8 +14290,6 @@ realclean:
  ValueBase.h \
  ValueBase.i \
  ObjectReferenceTemplateC.i \
- Messaging_SyncScopeC.h \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -14635,30 +14499,8 @@ realclean:
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h \
- PolicyC.h \
- CurrentC.h \
- CurrentC.i \
- Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h \
- PolicyC.i \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i \
- TAOC.i \
+ Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  operation_details.h \
  Service_Context.h \
  Service_Context.inl \
@@ -14722,6 +14564,13 @@ realclean:
  $(ACE_ROOT)/ace/Timeprobe.h \
  Stub.h \
  MProfile.h \
+ PolicyC.h \
+ CurrentC.h \
+ CurrentC.i \
+ Remote_Object_Proxy_Impl.h \
+ Object_Proxy_Impl.h \
+ Encodable.h \
+ PolicyC.i \
  MProfile.i \
  ORB.h \
  Services.h \
@@ -14740,6 +14589,16 @@ realclean:
  Resource_Factory.h \
  params.h \
  params.i \
+ TAO_Singleton_Manager.h \
+ TAO_Singleton_Manager.inl \
+ TAO_Singleton.h \
+ TAO_Singleton.inl \
+ TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  Adapter.h \
  Adapter.i \
  PolicyFactory_Registry.h \
@@ -14754,8 +14613,6 @@ realclean:
  ValueBase.h \
  ValueBase.i \
  ObjectReferenceTemplateC.i \
- Messaging_SyncScopeC.h \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -14944,8 +14801,7 @@ realclean:
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
  $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- PortableInterceptorC.h \
+ $(ACE_ROOT)/ace/Basic_Types.i PortableInterceptorC.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -15033,8 +14889,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- TAO_Export.h CurrentC.h \
+ corbafwd.i TAO_Export.h CurrentC.h \
  Object.h \
  Policy_ForwardC.h \
  Sequence.h \
@@ -15061,8 +14916,8 @@ realclean:
  CDR.i \
  Policy_ForwardC.i \
  Object.i \
- CurrentC.i \
- DynamicC.h Any.h \
+ CurrentC.i DynamicC.h \
+ Any.h \
  Typecode.h \
  Exception.h \
  Exception.i \
@@ -15070,21 +14925,19 @@ realclean:
  Any.i DynamicC.i \
  ObjectReferenceTemplateC.h OctetSeqC.h corbafwd.h Sequence.h \
  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
- ValueBase.i \
- Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Object.h Any.h IOPC.i Messaging_SyncScopeC.i PolicyC.h \
+ ValueBase.i Exception.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i PolicyC.h \
  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i PortableInterceptorC.i LocalObject.h \
- LocalObject.i ClientRequestInfo.inl ClientRequestInfo_i.h \
- Service_Context.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i PortableInterceptorC.i LocalObject.h LocalObject.i \
+ ClientRequestInfo.inl ClientRequestInfo_i.h Service_Context.h \
  IOPC.h \
- Service_Context.inl \
- PICurrent.h \
+ Service_Context.inl PICurrent.h \
  $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- PICurrent.inl ClientRequestInfo_i.inl
+ $(ACE_ROOT)/ace/Array_Base.cpp PICurrent.inl \
+ ClientRequestInfo_i.inl
 
 .obj/ClientRequestInfo_i.o .obj/ClientRequestInfo_i.so .shobj/ClientRequestInfo_i.o .shobj/ClientRequestInfo_i.so: ClientRequestInfo_i.cpp ClientRequestInfo_i.h \
  $(ACE_ROOT)/ace/pre.h corbafwd.h \
@@ -15180,10 +15033,8 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- PortableInterceptorC.h \
- corbafwd.h \
- TAO_Export.h CurrentC.h \
+ corbafwd.i PortableInterceptorC.h \
+ corbafwd.h TAO_Export.h CurrentC.h \
  Object.h \
  Policy_ForwardC.h \
  Sequence.h \
@@ -15210,8 +15061,8 @@ realclean:
  CDR.i \
  Policy_ForwardC.i \
  Object.i \
- CurrentC.i \
- DynamicC.h Any.h \
+ CurrentC.i DynamicC.h \
+ Any.h \
  Typecode.h \
  Exception.h \
  Exception.i \
@@ -15219,47 +15070,31 @@ realclean:
  Any.i DynamicC.i \
  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
  StringSeqC.h StringSeqC.i ValueBase.h \
- ValueBase.i \
- Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Object.h Any.h IOPC.i Messaging_SyncScopeC.i PolicyC.h \
+ ValueBase.i Exception.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i PolicyC.h \
  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i PortableInterceptorC.i Service_Context.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i PortableInterceptorC.i Service_Context.h \
  IOPC.h \
- Service_Context.inl \
- PICurrent.h \
+ Service_Context.inl PICurrent.h \
  $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- LocalObject.h LocalObject.i PICurrent.inl ClientRequestInfo_i.inl \
- Invocation.h CDR.h Synch_Reply_Dispatcher.h \
+ $(ACE_ROOT)/ace/Array_Base.cpp LocalObject.h \
+ LocalObject.i PICurrent.inl ClientRequestInfo_i.inl Invocation.h \
+ CDR.h Synch_Reply_Dispatcher.h \
  Reply_Dispatcher.h \
  Reply_Dispatcher.i \
  LF_Event.h \
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h PolicyC.h \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i TAOC.i \
  operation_details.h target_specification.h \
  Object_KeyC.h \
  Object_KeyC.i \
  target_specification.i operation_details.i Invocation.i Stub.h \
  MProfile.h \
+ PolicyC.h \
  MProfile.i \
  ORB.h \
  Services.h \
@@ -15284,6 +15119,16 @@ realclean:
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
  params.i \
+ TAO_Singleton_Manager.h \
+ TAO_Singleton_Manager.inl \
+ TAO_Singleton.h \
+ TAO_Singleton.inl \
+ TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  Adapter.h \
  Adapter.i \
  PolicyFactory_Registry.h \
@@ -15340,8 +15185,7 @@ realclean:
  $(ACE_ROOT)/ace/Thread_Manager.i \
  ORB_Core.i \
  Stub.i Profile.h \
- Tagged_Components.h \
- CONV_FRAMEC.h \
+ Tagged_Components.h CONV_FRAMEC.h \
  CONV_FRAMEC.i \
  Tagged_Components.i \
  GIOP_Message_Version.h Profile.i debug.h
@@ -15440,8 +15284,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- DynamicC.h \
+ corbafwd.i DynamicC.h \
  corbafwd.h \
  Any.h \
  CDR.h \
@@ -15474,20 +15317,18 @@ realclean:
  Exception.h \
  Exception.i \
  Typecode.i \
- Any.i DynamicC.i \
- Any.h StringSeqC.h Sequence.h StringSeqC.i
+ Any.i DynamicC.i Any.h \
+ StringSeqC.h Sequence.h StringSeqC.i
 
 .obj/ClientInterceptorAdapter.o .obj/ClientInterceptorAdapter.so .shobj/ClientInterceptorAdapter.o .shobj/ClientInterceptorAdapter.so: ClientInterceptorAdapter.cpp \
- ClientInterceptorAdapter.h \
- $(ACE_ROOT)/ace/pre.h orbconf.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
+ ClientInterceptorAdapter.h $(ACE_ROOT)/ace/pre.h \
+ orbconf.h $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
  $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- Interceptor_List.h corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.i Interceptor_List.h \
+ corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -15573,10 +15414,8 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- PortableInterceptorC.h \
- corbafwd.h \
- TAO_Export.h CurrentC.h \
+ corbafwd.i PortableInterceptorC.h \
+ corbafwd.h TAO_Export.h CurrentC.h \
  Object.h \
  Policy_ForwardC.h \
  Sequence.h \
@@ -15603,8 +15442,8 @@ realclean:
  CDR.i \
  Policy_ForwardC.i \
  Object.i \
- CurrentC.i \
- DynamicC.h Any.h \
+ CurrentC.i DynamicC.h \
+ Any.h \
  Typecode.h \
  Exception.h \
  Exception.i \
@@ -15612,21 +15451,20 @@ realclean:
  Any.i DynamicC.i \
  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
  StringSeqC.h StringSeqC.i ValueBase.h \
- ValueBase.i \
- Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Object.h Any.h IOPC.i Messaging_SyncScopeC.i PolicyC.h \
+ ValueBase.i Exception.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i PolicyC.h \
  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i PortableInterceptorC.i \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- Interceptor_List.inl ClientInterceptorAdapter.inl ClientRequestInfo.h \
- LocalObject.h LocalObject.i ClientRequestInfo.inl \
- ClientRequestInfo_i.h Service_Context.h \
- IOPC.h \
- Service_Context.inl \
- PICurrent.h PICurrent.inl ClientRequestInfo_i.inl Invocation.h CDR.h \
+ $(ACE_ROOT)/ace/Array_Base.cpp Interceptor_List.inl \
+ ClientInterceptorAdapter.inl ClientRequestInfo.h LocalObject.h \
+ LocalObject.i ClientRequestInfo.inl ClientRequestInfo_i.h \
+ Service_Context.h IOPC.h \
+ Service_Context.inl PICurrent.h \
+ PICurrent.inl ClientRequestInfo_i.inl Invocation.h CDR.h \
  Synch_Reply_Dispatcher.h \
  Reply_Dispatcher.h \
  Reply_Dispatcher.i \
@@ -15634,50 +15472,39 @@ realclean:
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h PolicyC.h \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i TAOC.i \
  operation_details.h target_specification.h \
  Object_KeyC.h \
  Object_KeyC.i \
  target_specification.i operation_details.i Invocation.i ORB_Core.h \
- ORB.h Services.h \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ ORB.h Services.h Services.i \
+ CORBA_String.h CORBA_String.inl \
+ ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
+ PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
  debug.h \
  Policy_Manager.i \
- Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
+ Resource_Factory.h $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- params.h \
+ $(ACE_ROOT)/ace/Service_Object.i params.h \
  CORBA_String.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- params.i \
- TAO_Singleton_Manager.h TAO_Singleton.h Adapter.h Adapter.i \
- PolicyFactory_Registry.h \
+ params.i TAO_Singleton_Manager.h \
+ TAO_Singleton_Manager.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
+ TAO_Singleton.cpp \
+ TAO_Singleton.h \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ TAO_Singleton_Manager.h Adapter.h \
+ Adapter.i PolicyFactory_Registry.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -15695,8 +15522,7 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Parser_Registry.h \
  Parser_Registry.i \
  Service_Callbacks.h \
  Service_Callbacks.i \
@@ -15711,8 +15537,7 @@ realclean:
  $(ACE_ROOT)/ace/Functor_T.cpp \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ Protocols_Hooks.h $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -15722,12 +15547,10 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i
 
 .obj/ObjectReferenceTemplateC.o .obj/ObjectReferenceTemplateC.so .shobj/ObjectReferenceTemplateC.o .shobj/ObjectReferenceTemplateC.so: ObjectReferenceTemplateC.cpp \
- ObjectReferenceTemplateC.h \
- $(ACE_ROOT)/ace/pre.h \
+ ObjectReferenceTemplateC.h $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -15821,9 +15644,8 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- OctetSeqC.h corbafwd.h Sequence.h \
- Managed_Types.h \
+ corbafwd.i OctetSeqC.h corbafwd.h \
+ Sequence.h Managed_Types.h \
  Managed_Types.i \
  Sequence.i \
  Sequence_T.h \
@@ -15831,10 +15653,10 @@ realclean:
  Sequence_T.i \
  Sequence_T.cpp \
  Environment.h \
- Environment.i \
- OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
- ValueBase.i \
- Exception.h $(ACE_ROOT)/ace/SString.h \
+ Environment.i OctetSeqC.i \
+ StringSeqC.h StringSeqC.i ValueBase.h \
+ ValueBase.i Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
  $(ACE_ROOT)/ace/String_Base_Const.h \
  $(ACE_ROOT)/ace/String_Base.i \
@@ -15844,8 +15666,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/SString.i \
  Exception.i \
- ObjectReferenceTemplateC.i \
- Stub.h \
+ ObjectReferenceTemplateC.i Stub.h \
  MProfile.h \
  PolicyC.h \
  CurrentC.h \
@@ -15910,9 +15731,9 @@ realclean:
  DynamicC.i \
  ObjectReferenceTemplateC.h \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -15978,13 +15799,6 @@ realclean:
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i \
- TAOC.i \
  operation_details.h \
  Service_Context.h \
  Service_Context.inl \
@@ -16005,8 +15819,7 @@ realclean:
  ClientInterceptorAdapter.inl
 
 .obj/PortableInterceptorC.o .obj/PortableInterceptorC.so .shobj/PortableInterceptorC.o .shobj/PortableInterceptorC.so: PortableInterceptorC.cpp \
- PortableInterceptorC.h \
- $(ACE_ROOT)/ace/pre.h \
+ PortableInterceptorC.h $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -16100,8 +15913,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- TAO_Export.h CurrentC.h \
+ corbafwd.i TAO_Export.h CurrentC.h \
  Object.h \
  Policy_ForwardC.h \
  Sequence.h \
@@ -16128,8 +15940,8 @@ realclean:
  CDR.i \
  Policy_ForwardC.i \
  Object.i \
- CurrentC.i \
- DynamicC.h Any.h \
+ CurrentC.i DynamicC.h \
+ Any.h \
  Typecode.h \
  Exception.h \
  Exception.i \
@@ -16137,12 +15949,12 @@ realclean:
  Any.i DynamicC.i \
  ObjectReferenceTemplateC.h OctetSeqC.h corbafwd.h Sequence.h \
  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
- ValueBase.i \
- Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Object.h Any.h IOPC.i Messaging_SyncScopeC.i PolicyC.h \
+ ValueBase.i Exception.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i PolicyC.h \
  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i PortableInterceptorC.i \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i PortableInterceptorC.i \
  Stub.h \
  MProfile.h \
  PolicyC.h \
@@ -16250,13 +16062,7 @@ realclean:
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i \
- TAOC.i \
+ Messaging_SyncScopeC.h \
  operation_details.h \
  Service_Context.h \
  Service_Context.inl \
@@ -16373,9 +16179,8 @@ realclean:
  corbafwd.i \
  $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- PortableInterceptorC.h TAO_Export.h CurrentC.h \
- Object.h \
+ $(ACE_ROOT)/ace/Array_Base.cpp PortableInterceptorC.h \
+ TAO_Export.h CurrentC.h Object.h \
  Policy_ForwardC.h \
  Sequence.h \
  Managed_Types.h \
@@ -16401,8 +16206,8 @@ realclean:
  CDR.i \
  Policy_ForwardC.i \
  Object.i \
- CurrentC.i \
- DynamicC.h Any.h \
+ CurrentC.i DynamicC.h \
+ Any.h \
  Typecode.h \
  Exception.h \
  Exception.i \
@@ -16410,39 +16215,33 @@ realclean:
  Any.i DynamicC.i \
  ObjectReferenceTemplateC.h OctetSeqC.h corbafwd.h Sequence.h \
  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
- ValueBase.i \
- Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Object.h Any.h IOPC.i Messaging_SyncScopeC.i PolicyC.h \
+ ValueBase.i Exception.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i PolicyC.h \
  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i PortableInterceptorC.i LocalObject.h \
- LocalObject.i PICurrent.inl ORB_Core.h ORB.h Services.h \
- Services.i \
- CORBA_String.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i PortableInterceptorC.i LocalObject.h LocalObject.i \
+ PICurrent.inl ORB_Core.h ORB.h Services.h \
+ Services.i CORBA_String.h \
  CORBA_String.inl \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
  debug.h \
  Policy_Manager.i \
- Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
+ Resource_Factory.h $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- params.h \
+ $(ACE_ROOT)/ace/Service_Object.i params.h \
  CORBA_String.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -16450,8 +16249,8 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h Adapter.i PolicyFactory_Registry.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Adapter.i PolicyFactory_Registry.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -16469,11 +16268,9 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Parser_Registry.h \
  Parser_Registry.i \
- Service_Callbacks.h \
- IOPC.h \
+ Service_Callbacks.h IOPC.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
@@ -16497,24 +16294,21 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i TAO_Server_Request.h Tagged_Profile.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
+ TAO_Server_Request.h Tagged_Profile.h \
  GIOPC.h \
  Object_KeyC.h \
  Object_KeyC.i \
  GIOPC.i \
- Tagged_Profile.i \
- Service_Context.h \
+ Tagged_Profile.i Service_Context.h \
  Service_Context.inl \
  TAO_Server_Request.i debug.h
 
 .obj/PICurrent_ORBInitializer.o .obj/PICurrent_ORBInitializer.so .shobj/PICurrent_ORBInitializer.o .shobj/PICurrent_ORBInitializer.so: PICurrent_ORBInitializer.cpp \
- PICurrent_ORBInitializer.h \
- $(ACE_ROOT)/ace/pre.h TAO_Export.h \
+ PICurrent_ORBInitializer.h $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- LocalObject.h Object.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl LocalObject.h Object.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -16630,11 +16424,11 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
  Policy_ForwardC.i \
- Object.i \
- LocalObject.i PortableInterceptorC.h CurrentC.h \
+ Object.i LocalObject.i \
+ PortableInterceptorC.h CurrentC.h \
  Object.h \
- CurrentC.i \
- DynamicC.h Any.h \
+ CurrentC.i DynamicC.h \
+ Any.h \
  Typecode.h \
  Exception.h \
  Exception.i \
@@ -16642,42 +16436,36 @@ realclean:
  Any.i DynamicC.i \
  ObjectReferenceTemplateC.h OctetSeqC.h corbafwd.h Sequence.h \
  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
- ValueBase.i \
- Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Any.h IOPC.i Messaging_SyncScopeC.i PolicyC.h Policy_ForwardC.h \
- Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i PortableInterceptorC.i PICurrent.h \
+ ValueBase.i Exception.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h Any.h IOPC.i PolicyC.h \
+ Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i PortableInterceptorC.i PICurrent.h \
  $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- PICurrent.inl ORB_Core.h ORB.h Services.h \
- Services.i \
- CORBA_String.h \
+ $(ACE_ROOT)/ace/Array_Base.cpp PICurrent.inl \
+ ORB_Core.h ORB.h Services.h \
+ Services.i CORBA_String.h \
  CORBA_String.inl \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
  debug.h \
  Policy_Manager.i \
- Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
+ Resource_Factory.h $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- params.h \
+ $(ACE_ROOT)/ace/Service_Object.i params.h \
  CORBA_String.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -16685,8 +16473,8 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h Adapter.i PolicyFactory_Registry.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Adapter.i PolicyFactory_Registry.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -16704,11 +16492,9 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Parser_Registry.h \
  Parser_Registry.i \
- Service_Callbacks.h \
- IOPC.h \
+ Service_Callbacks.h IOPC.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
@@ -16732,8 +16518,8 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i ORBInitInfo.h ORBInitInfo.inl
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
+ ORBInitInfo.h ORBInitInfo.inl
 
 .obj/DynamicC.o .obj/DynamicC.so .shobj/DynamicC.o .shobj/DynamicC.so: DynamicC.cpp DynamicC.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -16921,9 +16707,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -16989,13 +16775,6 @@ realclean:
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i \
- TAOC.i \
  operation_details.h \
  Service_Context.h \
  Service_Context.inl \
@@ -17106,8 +16885,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- Sequence.h \
+ corbafwd.i Sequence.h \
  corbafwd.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -17117,8 +16895,7 @@ realclean:
  Sequence_T.i \
  Sequence_T.cpp \
  Environment.h \
- Environment.i \
- OctetSeqC.i Any.h \
+ Environment.i OctetSeqC.i Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/SString.h \
@@ -17140,40 +16917,32 @@ realclean:
  Exception.h \
  Exception.i \
  Typecode.i \
- Any.i CDR.h \
- Typecode.h ORB_Core.h ORB.h Exception.h Services.h \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- PolicyC.h CurrentC.h \
- CurrentC.i \
+ Any.i CDR.h Typecode.h ORB_Core.h \
+ ORB.h Exception.h Services.h \
+ Services.i CORBA_String.h \
+ CORBA_String.inl PolicyC.h \
+ CurrentC.h CurrentC.i \
  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
  LocalObject.i \
  debug.h \
  Policy_Manager.i \
- Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
+ Resource_Factory.h $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- params.h \
+ $(ACE_ROOT)/ace/Service_Object.i params.h \
  CORBA_String.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -17181,14 +16950,13 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
- TAO_Export.h DynamicC.h \
- Any.h DynamicC.i \
- ObjectReferenceTemplateC.h StringSeqC.h StringSeqC.i ValueBase.h \
- ValueBase.i \
- ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h Object.h \
- IOPC.i Messaging_SyncScopeC.i PortableInterceptorC.i \
+ TAO_Singleton_Manager.h Adapter.h \
+ Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
+ TAO_Export.h DynamicC.h Any.h \
+ DynamicC.i ObjectReferenceTemplateC.h StringSeqC.h StringSeqC.i \
+ ValueBase.h ValueBase.i \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h Object.h IOPC.i PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -17206,16 +16974,13 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Parser_Registry.h \
  Parser_Registry.i \
- Service_Callbacks.h \
- IOPC.h \
+ Service_Callbacks.h IOPC.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
  $(ACE_ROOT)/ace/Array_Base.cpp \
  Cleanup_Func_Registry.inl Object_Ref_Table.h \
@@ -17239,8 +17004,7 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i
 
 .obj/StringSeqC.o .obj/StringSeqC.so .shobj/StringSeqC.o .shobj/StringSeqC.so: StringSeqC.cpp StringSeqC.h \
  $(ACE_ROOT)/ace/pre.h corbafwd.h \
@@ -17336,8 +17100,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- Sequence.h \
+ corbafwd.i Sequence.h \
  corbafwd.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -17347,8 +17110,7 @@ realclean:
  Sequence_T.i \
  Sequence_T.cpp \
  Environment.h \
- Environment.i \
- StringSeqC.i Any.h \
+ Environment.i StringSeqC.i Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/SString.h \
@@ -17370,8 +17132,7 @@ realclean:
  Exception.h \
  Exception.i \
  Typecode.i \
- Any.i CDR.h \
- Typecode.h
+ Any.i CDR.h Typecode.h
 
 .obj/ORB_Core.o .obj/ORB_Core.so .shobj/ORB_Core.o .shobj/ORB_Core.so: ORB_Core.cpp ORB_Core.h \
  $(ACE_ROOT)/ace/pre.h corbafwd.h \
@@ -17467,8 +17228,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i ORB.h \
- Exception.h \
+ corbafwd.i ORB.h Exception.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
@@ -17479,8 +17239,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Services.h \
+ Exception.i Services.h \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -17490,11 +17249,9 @@ realclean:
  Sequence_T.cpp \
  Environment.h \
  Environment.i \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- PolicyC.h CurrentC.h \
- Object.h \
+ Services.i CORBA_String.h \
+ CORBA_String.inl PolicyC.h \
+ CurrentC.h Object.h \
  Policy_ForwardC.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -17502,34 +17259,28 @@ realclean:
  CDR.i \
  Policy_ForwardC.i \
  Object.i \
- CurrentC.i \
- Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ CurrentC.i Policy_ForwardC.h \
+ Remote_Object_Proxy_Impl.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
  LocalObject.i \
  debug.h \
  Policy_Manager.i \
- Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
+ Resource_Factory.h $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- params.h \
+ $(ACE_ROOT)/ace/Service_Object.i params.h \
  CORBA_String.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -17537,21 +17288,19 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h \
- Exception.h \
- Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
- TAO_Export.h DynamicC.h \
- Any.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Exception.h Adapter.i \
+ PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h \
+ DynamicC.h Any.h \
  Typecode.h \
  Typecode.i \
  Any.i DynamicC.i \
  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
  StringSeqC.h StringSeqC.i ValueBase.h \
  ValueBase.i \
- ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h Object.h \
- Any.h IOPC.i Messaging_SyncScopeC.i PortableInterceptorC.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i \
+ PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Service_Config.h \
@@ -17568,16 +17317,13 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Parser_Registry.h \
  Parser_Registry.i \
- Service_Callbacks.h \
- IOPC.h \
+ Service_Callbacks.h IOPC.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
  $(ACE_ROOT)/ace/Array_Base.cpp \
  Cleanup_Func_Registry.inl Object_Ref_Table.h \
@@ -17601,32 +17347,26 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i ORB_Table.h \
- ORB_Table.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
+ ORB_Table.h ORB_Table.inl \
  TAO_Internal.h default_client.h \
  Client_Strategy_Factory.h \
- default_client.i \
- default_server.h \
+ default_client.i default_server.h \
  Server_Strategy_Factory.h \
  default_server.i \
  default_resource.h \
  Resource_Factory.h \
- default_resource.i \
- debug.h MProfile.h \
- MProfile.i \
- Profile.h Tagged_Components.h \
- CONV_FRAMEC.h \
+ default_resource.i debug.h \
+ MProfile.h MProfile.i Profile.h \
+ Tagged_Components.h CONV_FRAMEC.h \
  CONV_FRAMEC.i \
  Tagged_Components.i \
  GIOP_Message_Version.h \
- GIOP_Message_Version.inl \
- Profile.i Stub.h \
- MProfile.h \
+ GIOP_Message_Version.inl Profile.i \
+ Stub.h MProfile.h \
  ORB.h \
  ORB_Core.h \
- Stub.i \
- Leader_Follower.h \
+ Stub.i Leader_Follower.h \
  LF_Follower.h \
  $(ACE_ROOT)/ace/Intrusive_List_Node.h \
  $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
@@ -17642,8 +17382,7 @@ realclean:
  Connector_Registry.i \
  Acceptor_Registry.h \
  Acceptor_Registry.i \
- Sync_Strategies.h \
- Transport.h \
+ Sync_Strategies.h Transport.h \
  Transport_Descriptor_Interface.h \
  Transport_Descriptor_Interface.inl \
  Transport_Cache_Manager.h \
@@ -17667,16 +17406,16 @@ realclean:
  SmartProxies/Smart_Proxies.inl \
  TimeBaseC.i \
  TAOC.i \
- Sync_Strategies.i \
- Object_Loader.h Object_Loader.i ObjectIDList.h \
- ObjectIDList.i \
- Services_Activate.h Invocation.h CDR.h Synch_Reply_Dispatcher.h \
+ Sync_Strategies.i Object_Loader.h \
+ Object_Loader.i ObjectIDList.h \
+ ObjectIDList.i Services_Activate.h \
+ Invocation.h CDR.h Synch_Reply_Dispatcher.h \
  Reply_Dispatcher.h \
  Reply_Dispatcher.i \
  LF_Event.h \
  LF_Event.inl \
  GIOP_Message_Version.h \
- TAOC.h operation_details.h Service_Context.h \
+ operation_details.h Service_Context.h \
  Service_Context.inl \
  target_specification.h \
  Object_KeyC.h \
@@ -18076,11 +17815,6 @@ realclean:
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
- orbconf.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- TAO_Singleton.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -18090,6 +17824,9 @@ realclean:
  $(ACE_ROOT)/ace/OS_Errno.inl \
  $(ACE_ROOT)/ace/OS_Dirent.inl \
  $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/OS_String.inl \
  $(ACE_ROOT)/ace/OS_Memory.h \
  $(ACE_ROOT)/ace/OS_Memory.inl \
@@ -18128,15 +17865,6 @@ realclean:
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -18204,9 +17932,8 @@ realclean:
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- ORB_Table.inl \
- ORB_Core.h corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
+ ORB_Table.inl ORB_Core.h \
+ corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
@@ -18214,12 +17941,11 @@ realclean:
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(ACE_ROOT)/ace/CDR_Base.inl \
  $(ACE_ROOT)/ace/CORBA_macros.h \
+ orbconf.h \
  varbase.h \
- corbafwd.i ORB.h \
- Exception.h \
+ corbafwd.i ORB.h Exception.h \
  corbafwd.h \
- Exception.i \
- Services.h \
+ Exception.i Services.h \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -18229,11 +17955,9 @@ realclean:
  Sequence_T.cpp \
  Environment.h \
  Environment.i \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- PolicyC.h CurrentC.h \
- Object.h \
+ Services.i CORBA_String.h \
+ CORBA_String.inl PolicyC.h \
+ CurrentC.h Object.h \
  Policy_ForwardC.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -18241,13 +17965,11 @@ realclean:
  CDR.i \
  Policy_ForwardC.i \
  Object.i \
- CurrentC.i \
- Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ CurrentC.i Policy_ForwardC.h \
+ Remote_Object_Proxy_Impl.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
@@ -18256,38 +17978,42 @@ realclean:
  Policy_Manager.i \
  Resource_Factory.h params.h \
  CORBA_String.h \
- params.i \
- TAO_Singleton_Manager.h TAO_Singleton.h Adapter.h \
- Exception.h \
- Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
- TAO_Export.h DynamicC.h \
- Any.h \
+ params.i TAO_Singleton_Manager.h \
+ TAO_Singleton_Manager.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
+ TAO_Singleton.cpp \
+ TAO_Singleton.h \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ TAO_Singleton_Manager.h Adapter.h \
+ Exception.h Adapter.i \
+ PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h \
+ DynamicC.h Any.h \
  Typecode.h \
  Typecode.i \
  Any.i DynamicC.i \
  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
  StringSeqC.h StringSeqC.i ValueBase.h \
  ValueBase.i \
- ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h Object.h \
- Any.h IOPC.i Messaging_SyncScopeC.i PortableInterceptorC.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i \
+ PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
  Parser_Registry.i \
- Service_Callbacks.h \
- IOPC.h \
+ Service_Callbacks.h IOPC.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
  $(ACE_ROOT)/ace/Array_Base.cpp \
  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
- Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ Protocols_Hooks.h $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -18297,8 +18023,7 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i
 
 .obj/LF_Follower.o .obj/LF_Follower.so .shobj/LF_Follower.o .shobj/LF_Follower.so: LF_Follower.cpp \
  LF_Follower.h \
@@ -18490,9 +18215,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -18746,9 +18471,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -19003,9 +18728,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -19259,9 +18984,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -19542,9 +19267,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -19628,8 +19353,7 @@ realclean:
  LF_Event.inl \
  Queued_Message.inl
 
-.obj/LF_Event.o .obj/LF_Event.so .shobj/LF_Event.o .shobj/LF_Event.so: LF_Event.cpp \
- LF_Event.h \
+.obj/LF_Event.o .obj/LF_Event.so .shobj/LF_Event.o .shobj/LF_Event.so: LF_Event.cpp LF_Event.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -19820,9 +19544,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -20204,9 +19928,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -20269,8 +19993,7 @@ realclean:
  $(ACE_ROOT)/ace/Intrusive_List.cpp \
  Leader_Follower.i
 
-.obj/params.o .obj/params.so .shobj/params.o .shobj/params.so: params.cpp \
- params.h \
+.obj/params.o .obj/params.so .shobj/params.o .shobj/params.so: params.cpp params.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -20571,9 +20294,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -21014,8 +20737,7 @@ realclean:
  $(ACE_ROOT)/ace/pre.h TAO_Export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- default_server.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl default_server.h \
  Server_Strategy_Factory.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -21139,16 +20861,13 @@ realclean:
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- default_server.i \
- default_client.h \
+ default_server.i default_client.h \
  Client_Strategy_Factory.h \
  default_client.i \
  default_resource.h \
  Resource_Factory.h \
- default_resource.i \
- IIOP_Factory.h \
- Protocol_Factory.h \
- MCAST_Parser.h \
+ default_resource.i IIOP_Factory.h \
+ Protocol_Factory.h MCAST_Parser.h \
  IOR_Parser.h \
  Exception.h \
  Exception.i \
@@ -21222,9 +20941,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -21265,11 +20984,10 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i \
- MCAST_Parser.i CORBANAME_Parser.h CORBANAME_Parser.i \
- CORBALOC_Parser.h CORBALOC_Parser.i FILE_Parser.h FILE_Parser.i \
- DLL_Parser.h DLL_Parser.i StringSeqC.h Object_Loader.h \
- Object_Loader.i \
+ ORB_Core.i MCAST_Parser.i \
+ CORBANAME_Parser.h CORBANAME_Parser.i CORBALOC_Parser.h \
+ CORBALOC_Parser.i FILE_Parser.h FILE_Parser.i DLL_Parser.h \
+ DLL_Parser.i StringSeqC.h Object_Loader.h Object_Loader.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
  $(ACE_ROOT)/ace/Dynamic_Service.i \
@@ -21297,8 +21015,7 @@ realclean:
  $(ACE_ROOT)/ace/Env_Value_T.i \
  $(ACE_ROOT)/ace/Env_Value_T.cpp \
  $(ACE_ROOT)/ace/Argv_Type_Converter.h \
- $(ACE_ROOT)/ace/Argv_Type_Converter.inl \
- debug.h
+ $(ACE_ROOT)/ace/Argv_Type_Converter.inl debug.h
 
 .obj/TAO_Server_Request.o .obj/TAO_Server_Request.so .shobj/TAO_Server_Request.o .shobj/TAO_Server_Request.so: TAO_Server_Request.cpp TAO_Server_Request.h \
  $(ACE_ROOT)/ace/pre.h corbafwd.h \
@@ -21403,8 +21120,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(ACE_ROOT)/ace/SString.i \
- Tagged_Profile.h \
+ $(ACE_ROOT)/ace/SString.i Tagged_Profile.h \
  IOPC.h \
  corbafwd.h \
  Exception.h \
@@ -21435,53 +21151,43 @@ realclean:
  Object_KeyC.h \
  Object_KeyC.i \
  GIOPC.i \
- Tagged_Profile.i \
- OctetSeqC.h Sequence.h OctetSeqC.i Service_Context.h \
- Service_Context.inl \
- Object.h PICurrent.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Tagged_Profile.i OctetSeqC.h \
+ Sequence.h OctetSeqC.i Service_Context.h \
+ Service_Context.inl Object.h \
+ PICurrent.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- PortableInterceptorC.h TAO_Export.h CurrentC.h \
- CurrentC.i \
+ $(ACE_ROOT)/ace/Array_Base.cpp PortableInterceptorC.h \
+ TAO_Export.h CurrentC.h CurrentC.i \
  DynamicC.h DynamicC.i ObjectReferenceTemplateC.h StringSeqC.h \
  StringSeqC.i ValueBase.h \
- ValueBase.i \
- Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Messaging_SyncScopeC.i PolicyC.h Policy_ForwardC.h \
+ ValueBase.i Exception.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h PolicyC.h Policy_ForwardC.h \
  Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i PortableInterceptorC.i LocalObject.h \
- LocalObject.i PICurrent.inl TAO_Server_Request.i CDR.h Environment.h \
- Principal.h \
- Principal.i \
- ORB_Core.h ORB.h Services.h \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- ORB.i \
- Policy_Manager.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i PortableInterceptorC.i LocalObject.h LocalObject.i \
+ PICurrent.inl TAO_Server_Request.i CDR.h Environment.h Principal.h \
+ Principal.i ORB_Core.h ORB.h \
+ Services.h Services.i \
+ CORBA_String.h CORBA_String.inl \
+ ORB.i Policy_Manager.h \
  Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
  debug.h \
  Policy_Manager.i \
- Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
+ Resource_Factory.h $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- params.h \
+ $(ACE_ROOT)/ace/Service_Object.i params.h \
  CORBA_String.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -21489,8 +21195,8 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h Adapter.i PolicyFactory_Registry.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Adapter.i PolicyFactory_Registry.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -21508,8 +21214,7 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Parser_Registry.h \
  Parser_Registry.i \
  Service_Callbacks.h \
  Service_Callbacks.i \
@@ -21535,17 +21240,15 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h debug.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
+ Timeprobe.h $(ACE_ROOT)/ace/Timeprobe.h debug.h \
  Pluggable_Messaging_Utils.h \
  Pluggable_Messaging_Utils.i \
  Pluggable_Messaging.h \
  Pluggable_Messaging_Utils.h \
- Pluggable_Messaging.i \
- GIOP_Utils.h \
- GIOP_Utils.i \
- Transport.h Transport_Descriptor_Interface.h \
+ Pluggable_Messaging.i GIOP_Utils.h \
+ GIOP_Utils.i Transport.h \
+ Transport_Descriptor_Interface.h \
  Transport_Descriptor_Interface.inl \
  Transport_Cache_Manager.h \
  Cache_Entries.h \
@@ -21554,8 +21257,7 @@ realclean:
  $(ACE_ROOT)/ace/Recyclable.inl \
  Cache_Entries.inl \
  Transport_Cache_Manager.inl \
- Transport_Timer.h \
- $(ACE_ROOT)/ace/Refcountable.h \
+ Transport_Timer.h $(ACE_ROOT)/ace/Refcountable.h \
  $(ACE_ROOT)/ace/Refcountable.inl \
  Incoming_Message_Queue.h Incoming_Message_Queue.inl Transport.inl
 
@@ -21733,9 +21435,9 @@ realclean:
  ObjectReferenceTemplateC.h \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  DomainC.i \
  PollableC.h \
@@ -22348,9 +22050,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -22607,9 +22309,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -22972,8 +22674,8 @@ realclean:
  Reply_Dispatcher.i \
  Pluggable_Messaging_Utils.h \
  Pluggable_Messaging_Utils.i \
- debug.h \
- Transport.h corbafwd.h Exception.h Transport_Descriptor_Interface.h \
+ debug.h Transport.h corbafwd.h \
+ Exception.h Transport_Descriptor_Interface.h \
  Transport_Descriptor_Interface.inl \
  Transport_Cache_Manager.h \
  Cache_Entries.h \
@@ -23869,8 +23571,7 @@ realclean:
  $(ACE_ROOT)/ace/Thread_Manager.i \
  ORB_Core.i
 
-.obj/IOPC.o .obj/IOPC.so .shobj/IOPC.o .shobj/IOPC.so: IOPC.cpp IOPC.h \
- $(ACE_ROOT)/ace/pre.h \
+.obj/IOPC.o .obj/IOPC.so .shobj/IOPC.o .shobj/IOPC.so: IOPC.cpp IOPC.h $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -23964,8 +23665,8 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- Exception.h $(ACE_ROOT)/ace/SString.h \
+ corbafwd.i Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
  $(ACE_ROOT)/ace/String_Base_Const.h \
  $(ACE_ROOT)/ace/String_Base.i \
@@ -23974,8 +23675,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Object.h \
+ Exception.i Object.h \
  Policy_ForwardC.h \
  Sequence.h \
  Managed_Types.h \
@@ -24057,8 +23757,8 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
- IOPC.h \
  Messaging_SyncScopeC.i \
+ IOPC.h \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -24124,13 +23824,6 @@ realclean:
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i \
- TAOC.i \
  operation_details.h \
  Service_Context.h \
  Service_Context.inl \
@@ -24242,9 +23935,8 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- TAO_Export.h Exception.h \
- $(ACE_ROOT)/ace/SString.h \
+ corbafwd.i TAO_Export.h \
+ Exception.h $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
  $(ACE_ROOT)/ace/String_Base_Const.h \
  $(ACE_ROOT)/ace/String_Base.i \
@@ -24253,8 +23945,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Object.h \
+ Exception.i Object.h \
  Policy_ForwardC.h \
  Sequence.h \
  Managed_Types.h \
@@ -24270,8 +23961,8 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
  Policy_ForwardC.i \
- Object.i \
- PollableC.i Stub.h \
+ Object.i PollableC.i \
+ Stub.h \
  MProfile.h \
  PolicyC.h \
  CurrentC.h \
@@ -24336,9 +24027,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -24404,13 +24095,6 @@ realclean:
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i \
- TAOC.i \
  operation_details.h \
  Service_Context.h \
  Service_Context.inl \
@@ -24943,8 +24627,7 @@ realclean:
  IOPC.i \
  Service_Context.inl
 
-.obj/GIOPC.o .obj/GIOPC.so .shobj/GIOPC.o .shobj/GIOPC.so: GIOPC.cpp \
- GIOPC.h \
+.obj/GIOPC.o .obj/GIOPC.so .shobj/GIOPC.o .shobj/GIOPC.so: GIOPC.cpp GIOPC.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -25078,8 +24761,7 @@ realclean:
  Object_KeyC.i \
  GIOPC.i
 
-.obj/BoundsC.o .obj/BoundsC.so .shobj/BoundsC.o .shobj/BoundsC.so: BoundsC.cpp BoundsC.h \
- $(ACE_ROOT)/ace/pre.h \
+.obj/BoundsC.o .obj/BoundsC.so .shobj/BoundsC.o .shobj/BoundsC.so: BoundsC.cpp BoundsC.h $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -25173,9 +24855,8 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- TAO_Export.h Exception.h \
- $(ACE_ROOT)/ace/SString.h \
+ corbafwd.i TAO_Export.h \
+ Exception.h $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
  $(ACE_ROOT)/ace/String_Base_Const.h \
  $(ACE_ROOT)/ace/String_Base.i \
@@ -25266,9 +24947,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -25334,13 +25015,6 @@ realclean:
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i \
- TAOC.i \
  operation_details.h \
  Service_Context.h \
  Service_Context.inl \
@@ -25357,8 +25031,7 @@ realclean:
  ClientInterceptorAdapter.h \
  ClientInterceptorAdapter.inl
 
-.obj/TAOC.o .obj/TAOC.so .shobj/TAOC.o .shobj/TAOC.so: TAOC.cpp TAOC.h \
- $(ACE_ROOT)/ace/pre.h \
+.obj/TAOC.o .obj/TAOC.so .shobj/TAOC.o .shobj/TAOC.so: TAOC.cpp TAOC.h $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -25452,9 +25125,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- PolicyC.h \
- CurrentC.h \
+ corbafwd.i PolicyC.h CurrentC.h \
  Object.h \
  Policy_ForwardC.h \
  Sequence.h \
@@ -25481,18 +25152,15 @@ realclean:
  CDR.i \
  Policy_ForwardC.i \
  Object.i \
- CurrentC.i \
- Exception.h \
- Exception.i \
+ CurrentC.i Policy_ForwardC.h \
+ Exception.h Exception.i \
  Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h \
- PolicyC.i \
- TimeBaseC.h \
- Any.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i TimeBaseC.h Any.h \
  Typecode.h \
+ Exception.h \
  Typecode.i \
- Any.i \
+ Any.i TAO_Export.h \
  SmartProxies/Smart_Proxies.h \
  SmartProxies/smartproxies_export.h \
  TAO_Singleton.h \
@@ -25618,8 +25286,7 @@ realclean:
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- Object_Loader.i \
+ $(ACE_ROOT)/ace/Service_Object.i Object_Loader.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
  $(ACE_ROOT)/ace/Dynamic_Service.i \
@@ -25742,8 +25409,7 @@ realclean:
  Typecode.h \
  Typecode.i
 
-.obj/DLL_ORB.o .obj/DLL_ORB.so .shobj/DLL_ORB.o .shobj/DLL_ORB.so: DLL_ORB.cpp \
- DLL_ORB.h \
+.obj/DLL_ORB.o .obj/DLL_ORB.so .shobj/DLL_ORB.o .shobj/DLL_ORB.so: DLL_ORB.cpp DLL_ORB.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Service_Object.h \
@@ -25951,8 +25617,7 @@ realclean:
  $(ACE_ROOT)/ace/Argv_Type_Converter.h \
  $(ACE_ROOT)/ace/Argv_Type_Converter.inl
 
-.obj/Adapter.o .obj/Adapter.so .shobj/Adapter.o .shobj/Adapter.so: Adapter.cpp \
- Adapter.h \
+.obj/Adapter.o .obj/Adapter.so .shobj/Adapter.o .shobj/Adapter.so: Adapter.cpp Adapter.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -26137,9 +25802,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -26646,9 +26311,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -26962,8 +26627,8 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- DLL_Parser.i Object_Loader.h Object_Loader.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DLL_Parser.i \
+ Object_Loader.h Object_Loader.i \
  Object.h \
  Policy_ForwardC.h \
  Sequence.h \
@@ -27116,8 +26781,7 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- FILE_Parser.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h FILE_Parser.i \
  Object_Loader.h \
  Object_Loader.i \
  Object.h \
@@ -27283,8 +26947,8 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- CORBALOC_Parser.i ORB_Core.h corbafwd.h ORB.h Exception.h Services.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h CORBALOC_Parser.i \
+ ORB_Core.h corbafwd.h ORB.h Exception.h Services.h \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -27294,11 +26958,9 @@ realclean:
  Sequence_T.cpp \
  Environment.h \
  Environment.i \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- PolicyC.h CurrentC.h \
- Object.h \
+ Services.i CORBA_String.h \
+ CORBA_String.inl PolicyC.h \
+ CurrentC.h Object.h \
  Policy_ForwardC.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -27306,13 +26968,11 @@ realclean:
  CDR.i \
  Policy_ForwardC.i \
  Object.i \
- CurrentC.i \
- Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ CurrentC.i Policy_ForwardC.h \
+ Remote_Object_Proxy_Impl.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
@@ -27321,11 +26981,9 @@ realclean:
  Policy_Manager.i \
  Resource_Factory.h params.h \
  CORBA_String.h \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -27333,30 +26991,26 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
- TAO_Export.h DynamicC.h \
- Any.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
+ TAO_Export.h DynamicC.h Any.h \
  Typecode.h \
  Typecode.i \
  Any.i DynamicC.i \
  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
  StringSeqC.h StringSeqC.i ValueBase.h \
  ValueBase.i \
- ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h Object.h \
- Any.h IOPC.i Messaging_SyncScopeC.i PortableInterceptorC.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i \
+ PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
  Parser_Registry.i \
- Service_Callbacks.h \
- IOPC.h \
+ Service_Callbacks.h IOPC.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
  $(ACE_ROOT)/ace/Array_Base.cpp \
  Cleanup_Func_Registry.inl Object_Ref_Table.h \
@@ -27380,8 +27034,7 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i Stub.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i Stub.h \
  MProfile.h \
  MProfile.i \
  ORB.h \
@@ -27521,12 +27174,10 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- CORBANAME_Parser.i Invocation.h CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h CORBANAME_Parser.i \
+ Invocation.h CDR.h $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
- CDR.i \
- Synch_Reply_Dispatcher.h \
+ CDR.i Synch_Reply_Dispatcher.h \
  Reply_Dispatcher.h \
  IOPC.h \
  Object.h \
@@ -27553,35 +27204,21 @@ realclean:
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h PolicyC.h \
- CurrentC.h \
- CurrentC.i \
- Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h \
- PolicyC.i \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i TAOC.i \
- operation_details.h corbafwd.h Service_Context.h \
+ Messaging_SyncScopeC.h corbafwd.h Messaging_SyncScopeC.i \
+ operation_details.h Service_Context.h \
  Service_Context.inl \
  target_specification.h \
  Object_KeyC.h \
  Object_KeyC.i \
  target_specification.i operation_details.i Invocation.i Stub.h \
  MProfile.h \
+ PolicyC.h \
+ CurrentC.h \
+ CurrentC.i \
+ Remote_Object_Proxy_Impl.h \
+ Object_Proxy_Impl.h \
+ Encodable.h \
+ PolicyC.i \
  MProfile.i \
  ORB.h \
  Services.h \
@@ -27600,6 +27237,16 @@ realclean:
  Resource_Factory.h \
  params.h \
  params.i \
+ TAO_Singleton_Manager.h \
+ TAO_Singleton_Manager.inl \
+ TAO_Singleton.h \
+ TAO_Singleton.inl \
+ TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  Adapter.h \
  Adapter.i \
  PolicyFactory_Registry.h \
@@ -27615,7 +27262,6 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -27845,9 +27491,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -27903,8 +27549,7 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i \
- MCAST_Parser.i \
+ ORB_Core.i MCAST_Parser.i \
  Object_Loader.h \
  Object_Loader.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
@@ -28455,9 +28100,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PolicyC.h \
  Remote_Object_Proxy_Impl.h \
  Object_Proxy_Impl.h \
@@ -28671,10 +28316,8 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- PortableInterceptorC.h \
- corbafwd.h \
- TAO_Export.h CurrentC.h \
+ corbafwd.i PortableInterceptorC.h \
+ corbafwd.h TAO_Export.h CurrentC.h \
  Object.h \
  Policy_ForwardC.h \
  Sequence.h \
@@ -28701,8 +28344,8 @@ realclean:
  CDR.i \
  Policy_ForwardC.i \
  Object.i \
- CurrentC.i \
- DynamicC.h Any.h \
+ CurrentC.i DynamicC.h \
+ Any.h \
  Typecode.h \
  Exception.h \
  Exception.i \
@@ -28710,39 +28353,33 @@ realclean:
  Any.i DynamicC.i \
  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
  StringSeqC.h StringSeqC.i ValueBase.h \
- ValueBase.i \
- Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Object.h Any.h IOPC.i Messaging_SyncScopeC.i PolicyC.h \
+ ValueBase.i Exception.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i PolicyC.h \
  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i PortableInterceptorC.i LocalObject.h \
- LocalObject.i ORBInitInfo.inl ORB_Core.h ORB.h Services.h \
- Services.i \
- CORBA_String.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i PortableInterceptorC.i LocalObject.h LocalObject.i \
+ ORBInitInfo.inl ORB_Core.h ORB.h Services.h \
+ Services.i CORBA_String.h \
  CORBA_String.inl \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
  debug.h \
  Policy_Manager.i \
- Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
+ Resource_Factory.h $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- params.h \
+ $(ACE_ROOT)/ace/Service_Object.i params.h \
  CORBA_String.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -28750,8 +28387,8 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h Adapter.i PolicyFactory_Registry.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Adapter.i PolicyFactory_Registry.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -28769,16 +28406,13 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Parser_Registry.h \
  Parser_Registry.i \
- Service_Callbacks.h \
- IOPC.h \
+ Service_Callbacks.h IOPC.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
  $(ACE_ROOT)/ace/Array_Base.cpp \
  Cleanup_Func_Registry.inl Object_Ref_Table.h \
@@ -28791,8 +28425,7 @@ realclean:
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  Interceptor_List.h Interceptor_List.inl PICurrent.h PICurrent.inl \
- Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ Protocols_Hooks.h $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -28802,16 +28435,14 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i CodecFactory.h
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
+ CodecFactory.h
 
 .obj/ORBInitializer_Registry.o .obj/ORBInitializer_Registry.so .shobj/ORBInitializer_Registry.o .shobj/ORBInitializer_Registry.so: ORBInitializer_Registry.cpp \
- ORBInitializer_Registry.h \
- $(ACE_ROOT)/ace/pre.h TAO_Export.h \
+ ORBInitializer_Registry.h $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- PortableInterceptorC.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl PortableInterceptorC.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -28902,8 +28533,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- CurrentC.h \
+ corbafwd.i CurrentC.h \
  Object.h \
  Policy_ForwardC.h \
  Sequence.h \
@@ -28930,8 +28560,8 @@ realclean:
  CDR.i \
  Policy_ForwardC.i \
  Object.i \
- CurrentC.i \
- DynamicC.h Any.h \
+ CurrentC.i DynamicC.h \
+ Any.h \
  Typecode.h \
  Exception.h \
  Exception.i \
@@ -28939,13 +28569,20 @@ realclean:
  Any.i DynamicC.i \
  ObjectReferenceTemplateC.h OctetSeqC.h corbafwd.h Sequence.h \
  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
- ValueBase.i \
- Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Object.h Any.h IOPC.i Messaging_SyncScopeC.i PolicyC.h \
+ ValueBase.i Exception.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i PolicyC.h \
  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i PortableInterceptorC.i TAO_Singleton.h \
- TAO_Singleton.inl \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i PortableInterceptorC.i \
+ $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.inl \
+ $(ACE_ROOT)/ace/Array_Base.cpp ORB.h Services.h \
+ Services.i CORBA_String.h \
+ CORBA_String.inl \
+ ORB.i TAO_Singleton_Manager.h \
+ TAO_Singleton_Manager.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -28953,23 +28590,11 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
- $(ACE_ROOT)/ace/Array_Base.h \
- $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- ORBInitializer_Registry.inl \
- ORB.h Services.h \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- ORB.i \
  TAO_Singleton_Manager.h
 
 .obj/PolicyFactory_Registry.o .obj/PolicyFactory_Registry.so .shobj/PolicyFactory_Registry.o .shobj/PolicyFactory_Registry.so: PolicyFactory_Registry.cpp \
- PolicyFactory_Registry.h \
- $(ACE_ROOT)/ace/pre.h corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
+ PolicyFactory_Registry.h $(ACE_ROOT)/ace/pre.h \
+ corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -29061,10 +28686,8 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- PortableInterceptorC.h \
- corbafwd.h \
- TAO_Export.h CurrentC.h \
+ corbafwd.i PortableInterceptorC.h \
+ corbafwd.h TAO_Export.h CurrentC.h \
  Object.h \
  Policy_ForwardC.h \
  Sequence.h \
@@ -29091,8 +28714,8 @@ realclean:
  CDR.i \
  Policy_ForwardC.i \
  Object.i \
- CurrentC.i \
- DynamicC.h Any.h \
+ CurrentC.i DynamicC.h \
+ Any.h \
  Typecode.h \
  Exception.h \
  Exception.i \
@@ -29100,12 +28723,12 @@ realclean:
  Any.i DynamicC.i \
  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
  StringSeqC.h StringSeqC.i ValueBase.h \
- ValueBase.i \
- Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Object.h Any.h IOPC.i Messaging_SyncScopeC.i PolicyC.h \
+ ValueBase.i Exception.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i PolicyC.h \
  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i PortableInterceptorC.i \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -29680,9 +29303,8 @@ realclean:
  Condition.cpp
 
 .obj/Cleanup_Func_Registry.o .obj/Cleanup_Func_Registry.so .shobj/Cleanup_Func_Registry.o .shobj/Cleanup_Func_Registry.so: Cleanup_Func_Registry.cpp \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/pre.h corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/pre.h \
+ corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -30014,8 +29636,7 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Object.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Object.h \
  corbafwd.h \
  Policy_ForwardC.h \
  Sequence.h \
@@ -30032,11 +29653,9 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
  Policy_ForwardC.i \
- Object.i \
- Exception.h \
- Exception.i \
- Environment.h CORBA_String.h \
- CORBA_String.inl \
+ Object.i Exception.h \
+ Exception.i Environment.h \
+ CORBA_String.h CORBA_String.inl \
  debug.h
 
 .obj/BiDir_Adapter.o .obj/BiDir_Adapter.so .shobj/BiDir_Adapter.o .shobj/BiDir_Adapter.so: BiDir_Adapter.cpp \
@@ -30251,8 +29870,8 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- Exception.h $(ACE_ROOT)/ace/SString.h \
+ corbafwd.i Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
  $(ACE_ROOT)/ace/String_Base_Const.h \
  $(ACE_ROOT)/ace/String_Base.i \
@@ -30261,8 +29880,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Object.h \
+ Exception.i Object.h \
  Policy_ForwardC.h \
  Sequence.h \
  Managed_Types.h \
@@ -30283,16 +29901,14 @@ realclean:
  Typecode.h \
  Exception.h \
  Typecode.i \
- Any.i IOPC.i \
- LocalObject.h LocalObject.i CDR_Encaps_Codec.h
+ Any.i IOPC.i LocalObject.h \
+ LocalObject.i CDR_Encaps_Codec.h
 
 .obj/CodecFactory_ORBInitializer.o .obj/CodecFactory_ORBInitializer.so .shobj/CodecFactory_ORBInitializer.o .shobj/CodecFactory_ORBInitializer.so: CodecFactory_ORBInitializer.cpp \
- CodecFactory_ORBInitializer.h \
- $(ACE_ROOT)/ace/pre.h TAO_Export.h \
+ CodecFactory_ORBInitializer.h $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- PortableInterceptorC.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl PortableInterceptorC.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -30383,8 +29999,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- CurrentC.h \
+ corbafwd.i CurrentC.h \
  Object.h \
  Policy_ForwardC.h \
  Sequence.h \
@@ -30411,8 +30026,8 @@ realclean:
  CDR.i \
  Policy_ForwardC.i \
  Object.i \
- CurrentC.i \
- DynamicC.h Any.h \
+ CurrentC.i DynamicC.h \
+ Any.h \
  Typecode.h \
  Exception.h \
  Exception.i \
@@ -30420,13 +30035,13 @@ realclean:
  Any.i DynamicC.i \
  ObjectReferenceTemplateC.h OctetSeqC.h corbafwd.h Sequence.h \
  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
- ValueBase.i \
- Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Object.h Any.h IOPC.i Messaging_SyncScopeC.i PolicyC.h \
+ ValueBase.i Exception.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i PolicyC.h \
  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i PortableInterceptorC.i LocalObject.h \
- LocalObject.i CodecFactory.h ORBInitInfo.h ORBInitInfo.inl
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i PortableInterceptorC.i LocalObject.h LocalObject.i \
+ CodecFactory.h ORBInitInfo.h ORBInitInfo.inl
 
 .obj/CDR_Encaps_Codec.o .obj/CDR_Encaps_Codec.so .shobj/CDR_Encaps_Codec.o .shobj/CDR_Encaps_Codec.so: CDR_Encaps_Codec.cpp CDR.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -30535,9 +30150,8 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/CDR_Stream.i \
- CDR.i OctetSeqC.h \
- corbafwd.h Sequence.h \
- Managed_Types.h \
+ CDR.i OctetSeqC.h corbafwd.h \
+ Sequence.h Managed_Types.h \
  Managed_Types.i \
  Sequence.i \
  Sequence_T.h \
@@ -30545,8 +30159,7 @@ realclean:
  Sequence_T.i \
  Sequence_T.cpp \
  Environment.h \
- Environment.i \
- OctetSeqC.i Any.h \
+ Environment.i OctetSeqC.i Any.h \
  CDR.h \
  Object.h \
  Policy_ForwardC.h \
@@ -30556,8 +30169,7 @@ realclean:
  Exception.h \
  Exception.i \
  Typecode.i \
- Any.i Typecode.h \
- Marshal.h \
+ Any.i Typecode.h Marshal.h \
  Principal.h \
  OctetSeqC.h \
  Principal.i \
@@ -30575,9 +30187,9 @@ realclean:
  Encodable.h \
  PolicyC.i \
  ORB.i \
- Marshal.i \
- CDR_Encaps_Codec.h TAO_Export.h IOPC.h Exception.h Object.h IOPC.i \
- LocalObject.h LocalObject.i
+ Marshal.i CDR_Encaps_Codec.h \
+ TAO_Export.h IOPC.h Exception.h Object.h IOPC.i LocalObject.h \
+ LocalObject.i
 
 .obj/Endpoint_Selector_Factory.o .obj/Endpoint_Selector_Factory.so .shobj/Endpoint_Selector_Factory.o .shobj/Endpoint_Selector_Factory.so: Endpoint_Selector_Factory.cpp \
  Endpoint_Selector_Factory.h \
@@ -30782,8 +30394,7 @@ realclean:
  corbafwd.i
 
 .obj/Block_Flushing_Strategy.o .obj/Block_Flushing_Strategy.so .shobj/Block_Flushing_Strategy.o .shobj/Block_Flushing_Strategy.so: Block_Flushing_Strategy.cpp \
- Block_Flushing_Strategy.h \
- $(ACE_ROOT)/ace/pre.h \
+ Block_Flushing_Strategy.h $(ACE_ROOT)/ace/pre.h \
  Flushing_Strategy.h corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -30877,8 +30488,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- Transport.h Exception.h \
+ corbafwd.i Transport.h Exception.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
@@ -30962,8 +30572,7 @@ realclean:
  LF_Event.inl Queued_Message.inl
 
 .obj/Reactive_Flushing_Strategy.o .obj/Reactive_Flushing_Strategy.so .shobj/Reactive_Flushing_Strategy.o .shobj/Reactive_Flushing_Strategy.so: Reactive_Flushing_Strategy.cpp \
- Reactive_Flushing_Strategy.h \
- $(ACE_ROOT)/ace/pre.h \
+ Reactive_Flushing_Strategy.h $(ACE_ROOT)/ace/pre.h \
  Flushing_Strategy.h corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -31057,8 +30666,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- Transport.h Exception.h \
+ corbafwd.i Transport.h Exception.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
@@ -31139,17 +30747,13 @@ realclean:
  IOPC.i \
  Pluggable_Messaging_Utils.i \
  Incoming_Message_Queue.inl Transport.inl ORB_Core.h ORB.h Services.h \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- PolicyC.h CurrentC.h \
- CurrentC.i \
+ Services.i CORBA_String.h \
+ CORBA_String.inl PolicyC.h \
+ CurrentC.h CurrentC.i \
  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
@@ -31158,11 +30762,9 @@ realclean:
  Policy_Manager.i \
  Resource_Factory.h params.h \
  CORBA_String.h \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -31170,30 +30772,27 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
- DynamicC.h DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h \
- Sequence.h OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
+ DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h \
+ OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
  ValueBase.i \
- ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Messaging_SyncScopeC.i PortableInterceptorC.i \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
  Parser_Registry.i \
  Service_Callbacks.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
  $(ACE_ROOT)/ace/Array_Base.cpp \
  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
- Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ Protocols_Hooks.h $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -31203,9 +30802,8 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i Queued_Message.h LF_Event.h LF_Event.inl \
- Queued_Message.inl debug.h
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
+ Queued_Message.h LF_Event.h LF_Event.inl Queued_Message.inl debug.h
 
 .obj/Connect_Strategy.o .obj/Connect_Strategy.so .shobj/Connect_Strategy.o .shobj/Connect_Strategy.so: Connect_Strategy.cpp Connect_Strategy.h \
  $(ACE_ROOT)/ace/pre.h TAO_Export.h \
@@ -31214,8 +30812,7 @@ realclean:
  $(ACE_ROOT)/ace/ace_wchar.inl
 
 .obj/Blocked_Connect_Strategy.o .obj/Blocked_Connect_Strategy.so .shobj/Blocked_Connect_Strategy.o .shobj/Blocked_Connect_Strategy.so: Blocked_Connect_Strategy.cpp \
- Blocked_Connect_Strategy.h \
- $(ACE_ROOT)/ace/pre.h \
+ Blocked_Connect_Strategy.h $(ACE_ROOT)/ace/pre.h \
  Connect_Strategy.h TAO_Export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
@@ -31259,14 +30856,12 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.i
 
 .obj/Reactive_Connect_Strategy.o .obj/Reactive_Connect_Strategy.so .shobj/Reactive_Connect_Strategy.o .shobj/Reactive_Connect_Strategy.so: Reactive_Connect_Strategy.cpp \
- Reactive_Connect_Strategy.h \
- $(ACE_ROOT)/ace/pre.h \
+ Reactive_Connect_Strategy.h $(ACE_ROOT)/ace/pre.h \
  Connect_Strategy.h TAO_Export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- Transport.h corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl Connection_Handler.h \
+ LF_Event.h corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -31355,9 +30950,15 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- Exception.h \
- corbafwd.h \
+ corbafwd.i LF_Event.inl \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ Connection_Handler.inl Transport.h \
+ Exception.h corbafwd.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
  $(ACE_ROOT)/ace/String_Base_Const.h \
@@ -31407,8 +31008,7 @@ realclean:
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  Transport_Cache_Manager.inl \
- Transport_Timer.h \
- $(ACE_ROOT)/ace/Refcountable.h \
+ Transport_Timer.h $(ACE_ROOT)/ace/Refcountable.h \
  $(ACE_ROOT)/ace/Refcountable.inl \
  Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
  IOPC.h \
@@ -31437,17 +31037,13 @@ realclean:
  IOPC.i \
  Pluggable_Messaging_Utils.i \
  Incoming_Message_Queue.inl Transport.inl ORB_Core.h ORB.h Services.h \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- PolicyC.h CurrentC.h \
- CurrentC.i \
+ Services.i CORBA_String.h \
+ CORBA_String.inl PolicyC.h \
+ CurrentC.h CurrentC.i \
  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
@@ -31456,11 +31052,249 @@ realclean:
  Policy_Manager.i \
  Resource_Factory.h params.h \
  CORBA_String.h \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
+ TAO_Singleton.cpp \
  TAO_Singleton.h \
- TAO_Singleton.inl \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ TAO_Singleton_Manager.h Adapter.h \
+ Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
+ DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h \
+ OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+ ValueBase.i \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
+ Parser_Registry.i \
+ Service_Callbacks.h \
+ Service_Callbacks.i \
+ Fault_Tolerance_Service.h \
+ Fault_Tolerance_Service.i \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.inl \
+ $(ACE_ROOT)/ace/Array_Base.cpp \
+ Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
+ Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+ Protocols_Hooks.h $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i
+
+.obj/LF_Connect_Strategy.o .obj/LF_Connect_Strategy.so .shobj/LF_Connect_Strategy.o .shobj/LF_Connect_Strategy.so: LF_Connect_Strategy.cpp LF_Connect_Strategy.h \
+ $(ACE_ROOT)/ace/pre.h Connect_Strategy.h TAO_Export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl Connection_Handler.h \
+ LF_Event.h corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Time_Value.inl \
+ $(ACE_ROOT)/ace/Default_Constants.h \
+ $(ACE_ROOT)/ace/Global_Macros.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Unbounded_Set.h \
+ $(ACE_ROOT)/ace/Node.h \
+ $(ACE_ROOT)/ace/Node.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Set.inl \
+ $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ orbconf.h \
+ varbase.h \
+ TAO_Export.h \
+ corbafwd.i LF_Event.inl \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ Connection_Handler.inl Transport.h \
+ Exception.h corbafwd.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/String_Base.h \
+ $(ACE_ROOT)/ace/String_Base_Const.h \
+ $(ACE_ROOT)/ace/String_Base.i \
+ $(ACE_ROOT)/ace/String_Base.cpp \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
+ Transport_Descriptor_Interface.h \
+ Transport_Descriptor_Interface.inl \
+ Transport_Cache_Manager.h \
+ Cache_Entries.h \
+ Transport_Descriptor_Interface.h \
+ $(ACE_ROOT)/ace/Recyclable.h \
+ $(ACE_ROOT)/ace/Recyclable.inl \
+ Cache_Entries.inl \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ Transport_Cache_Manager.inl \
+ Transport_Timer.h $(ACE_ROOT)/ace/Refcountable.h \
+ $(ACE_ROOT)/ace/Refcountable.inl \
+ Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
+ IOPC.h \
+ Exception.h \
+ Object.h \
+ Policy_ForwardC.h \
+ Sequence.h \
+ Managed_Types.h \
+ Managed_Types.i \
+ Sequence.i \
+ Sequence_T.h \
+ Sequence_T.i \
+ Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
+ CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ CDR.i \
+ Policy_ForwardC.i \
+ Object.i \
+ Any.h \
+ Typecode.h \
+ Typecode.i \
+ Any.i \
+ IOPC.i \
+ Pluggable_Messaging_Utils.i \
+ Incoming_Message_Queue.inl Transport.inl ORB_Core.h ORB.h Services.h \
+ Services.i CORBA_String.h \
+ CORBA_String.inl PolicyC.h \
+ CurrentC.h CurrentC.i \
+ Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
+ PolicyC.h \
+ Policy_Set.i \
+ LocalObject.h \
+ LocalObject.i \
+ debug.h \
+ Policy_Manager.i \
+ Resource_Factory.h params.h \
+ CORBA_String.h \
+ params.i TAO_Singleton_Manager.h \
+ TAO_Singleton_Manager.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -31468,30 +31302,27 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
- DynamicC.h DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h \
- Sequence.h OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
+ DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h \
+ OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
  ValueBase.i \
- ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Messaging_SyncScopeC.i PortableInterceptorC.i \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
  Parser_Registry.i \
  Service_Callbacks.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
  $(ACE_ROOT)/ace/Array_Base.cpp \
  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
- Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ Protocols_Hooks.h $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -31501,8 +31332,18 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i \
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
+ Leader_Follower.h LF_Follower.h \
+ $(ACE_ROOT)/ace/Intrusive_List_Node.h \
+ $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
+ $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
+ LF_Follower.inl \
+ ORB_Core.h \
+ New_Leader_Generator.h \
+ $(ACE_ROOT)/ace/Intrusive_List.h \
+ $(ACE_ROOT)/ace/Intrusive_List.inl \
+ $(ACE_ROOT)/ace/Intrusive_List.cpp \
+ Leader_Follower.i \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i
 
@@ -31600,13 +31441,12 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- LF_Event.h LF_Event.inl Queued_Message.inl
+ corbafwd.i LF_Event.h LF_Event.inl \
+ Queued_Message.inl
 
 .obj/Synch_Queued_Message.o .obj/Synch_Queued_Message.so .shobj/Synch_Queued_Message.o .shobj/Synch_Queued_Message.so: Synch_Queued_Message.cpp \
- Synch_Queued_Message.h \
- $(ACE_ROOT)/ace/pre.h Queued_Message.h \
- corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
+ Synch_Queued_Message.h $(ACE_ROOT)/ace/pre.h \
+ Queued_Message.h corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -31698,13 +31538,12 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- LF_Event.h LF_Event.inl Queued_Message.inl
+ corbafwd.i LF_Event.h LF_Event.inl \
+ Queued_Message.inl
 
 .obj/Asynch_Queued_Message.o .obj/Asynch_Queued_Message.so .shobj/Asynch_Queued_Message.o .shobj/Asynch_Queued_Message.so: Asynch_Queued_Message.cpp \
- Asynch_Queued_Message.h \
- $(ACE_ROOT)/ace/pre.h Queued_Message.h \
- corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
+ Asynch_Queued_Message.h $(ACE_ROOT)/ace/pre.h \
+ Queued_Message.h corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -31796,8 +31635,8 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- LF_Event.h LF_Event.inl Queued_Message.inl
+ corbafwd.i LF_Event.h LF_Event.inl \
+ Queued_Message.inl
 
 .obj/Transport_Timer.o .obj/Transport_Timer.so .shobj/Transport_Timer.o .shobj/Transport_Timer.so: Transport_Timer.cpp Transport_Timer.h \
  $(ACE_ROOT)/ace/pre.h TAO_Export.h \
@@ -31840,8 +31679,7 @@ realclean:
  $(ACE_ROOT)/ace/Sock_Connect.h \
  $(ACE_ROOT)/ace/Sock_Connect.i \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Event_Handler.i \
- Transport.h corbafwd.h \
+ $(ACE_ROOT)/ace/Event_Handler.i Transport.h corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
@@ -31894,8 +31732,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- Exception.h \
+ corbafwd.i Exception.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
@@ -31994,8 +31831,7 @@ realclean:
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
  Connection_Purging_Strategy.inl \
- Transport.h corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
+ Transport.h corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -32083,8 +31919,7 @@ realclean:
  $(ACE_ROOT)/ace/CORBA_macros.h \
  orbconf.h \
  varbase.h \
- corbafwd.i \
- Exception.h \
+ corbafwd.i Exception.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
@@ -32620,9 +32455,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -32893,9 +32728,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -33168,9 +33003,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -33229,8 +33064,7 @@ realclean:
  Leader_Follower.i
 
 .obj/Default_Stub_Factory.o .obj/Default_Stub_Factory.so .shobj/Default_Stub_Factory.o .shobj/Default_Stub_Factory.so: Default_Stub_Factory.cpp \
- Default_Stub_Factory.h \
- $(ACE_ROOT)/ace/pre.h \
+ Default_Stub_Factory.h $(ACE_ROOT)/ace/pre.h \
  Stub_Factory.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -33356,8 +33190,8 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Stub.h MProfile.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Stub.h \
+ MProfile.h \
  PolicyC.h \
  CurrentC.h \
  Object.h \
@@ -33431,9 +33265,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -33608,55 +33442,46 @@ realclean:
  Typecode.h \
  Typecode.i \
  Any.i \
- IOPC.i \
- TAO_Server_Request.h corbafwd.h Tagged_Profile.h \
+ IOPC.i TAO_Server_Request.h \
+ corbafwd.h Tagged_Profile.h \
  GIOPC.h \
  GIOPC.i \
- Tagged_Profile.i \
- OctetSeqC.h Sequence.h OctetSeqC.i Service_Context.h \
- Service_Context.inl \
- Object.h PICurrent.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Tagged_Profile.i OctetSeqC.h \
+ Sequence.h OctetSeqC.i Service_Context.h \
+ Service_Context.inl Object.h \
+ PICurrent.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- PortableInterceptorC.h TAO_Export.h CurrentC.h \
- CurrentC.i \
+ $(ACE_ROOT)/ace/Array_Base.cpp PortableInterceptorC.h \
+ TAO_Export.h CurrentC.h CurrentC.i \
  DynamicC.h DynamicC.i ObjectReferenceTemplateC.h StringSeqC.h \
  StringSeqC.i ValueBase.h \
- ValueBase.i \
- Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Messaging_SyncScopeC.i PolicyC.h Policy_ForwardC.h \
+ ValueBase.i Exception.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h PolicyC.h Policy_ForwardC.h \
  Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i PortableInterceptorC.i LocalObject.h \
- LocalObject.i PICurrent.inl TAO_Server_Request.i ORB_Core.h ORB.h \
- Services.h \
- Services.i \
- CORBA_String.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i PortableInterceptorC.i LocalObject.h LocalObject.i \
+ PICurrent.inl TAO_Server_Request.i ORB_Core.h ORB.h Services.h \
+ Services.i CORBA_String.h \
  CORBA_String.inl \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
  debug.h \
  Policy_Manager.i \
- Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
+ Resource_Factory.h $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- params.h \
+ $(ACE_ROOT)/ace/Service_Object.i params.h \
  CORBA_String.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -33664,8 +33489,8 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h Adapter.i PolicyFactory_Registry.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Adapter.i PolicyFactory_Registry.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -33683,8 +33508,7 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Parser_Registry.h \
  Parser_Registry.i \
  Service_Callbacks.h \
  Service_Callbacks.i \
@@ -33710,11 +33534,9 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i
 
-.obj/Services.o .obj/Services.so .shobj/Services.o .shobj/Services.so: Services.cpp \
- Services.h \
+.obj/Services.o .obj/Services.so .shobj/Services.o .shobj/Services.so: Services.cpp Services.h \
  $(ACE_ROOT)/ace/pre.h \
  Sequence.h \
  corbafwd.h \
@@ -33897,9 +33719,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -33957,8 +33779,7 @@ realclean:
  $(ACE_ROOT)/ace/Thread_Manager.i \
  ORB_Core.i
 
-.obj/NVList.o .obj/NVList.so .shobj/NVList.o .shobj/NVList.so: NVList.cpp \
- NVList.h \
+.obj/NVList.o .obj/NVList.so .shobj/NVList.o .shobj/NVList.so: NVList.cpp NVList.h \
  $(ACE_ROOT)/ace/pre.h \
  orbconf.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -34395,9 +34216,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -34643,9 +34464,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -34870,288 +34691,7 @@ realclean:
  Buffering_Constraint_Policy.i
 
 .obj/Messaging_PolicyValueC.o .obj/Messaging_PolicyValueC.so .shobj/Messaging_PolicyValueC.o .shobj/Messaging_PolicyValueC.so: Messaging_PolicyValueC.cpp \
- Messaging_PolicyValueC.h \
- $(ACE_ROOT)/ace/pre.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Time_Value.inl \
- $(ACE_ROOT)/ace/Default_Constants.h \
- $(ACE_ROOT)/ace/Global_Macros.h \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Unbounded_Set.h \
- $(ACE_ROOT)/ace/Node.h \
- $(ACE_ROOT)/ace/Node.cpp \
- $(ACE_ROOT)/ace/Unbounded_Set.inl \
- $(ACE_ROOT)/ace/Unbounded_Set.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- orbconf.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i IOPC.h \
- Exception.h $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/String_Base.h \
- $(ACE_ROOT)/ace/String_Base_Const.h \
- $(ACE_ROOT)/ace/String_Base.i \
- $(ACE_ROOT)/ace/String_Base.cpp \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Object.h \
- Policy_ForwardC.h \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- Environment.h \
- Environment.i \
- CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- CDR.i \
- Policy_ForwardC.i \
- Object.i Any.h \
- Object.h \
- Typecode.h \
- Exception.h \
- Typecode.i \
- Any.i IOPC.i \
- Sequence.h Messaging_PolicyValueC.i \
- Stub.h \
- MProfile.h \
- PolicyC.h \
- CurrentC.h \
- CurrentC.i \
- Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h \
- PolicyC.i \
- MProfile.i \
- ORB.h \
- Services.h \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- ORB.i \
- ORB_Core.h \
- Policy_Manager.h \
- Policy_Set.h \
- Policy_Set.i \
- LocalObject.h \
- LocalObject.i \
- debug.h \
- Policy_Manager.i \
- Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- params.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- params.i \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- Adapter.h \
- Adapter.i \
- PolicyFactory_Registry.h \
- PortableInterceptorC.h \
- DynamicC.h \
- Any.h \
- DynamicC.i \
- ObjectReferenceTemplateC.h \
- OctetSeqC.h \
- OctetSeqC.i \
- StringSeqC.h \
- StringSeqC.i \
- ValueBase.h \
- ValueBase.i \
- ObjectReferenceTemplateC.i \
- Messaging_SyncScopeC.h \
- IOPC.h \
- Messaging_SyncScopeC.i \
- PortableInterceptorC.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Parser_Registry.h \
- Parser_Registry.i \
- Service_Callbacks.h \
- Service_Callbacks.i \
- Fault_Tolerance_Service.h \
- Fault_Tolerance_Service.i \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
- $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- Cleanup_Func_Registry.inl \
- Object_Ref_Table.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- Interceptor_List.h \
- Interceptor_List.inl \
- PICurrent.h \
- PICurrent.inl \
- Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i \
- Stub.i \
- Invocation.h \
- Synch_Reply_Dispatcher.h \
- Reply_Dispatcher.h \
- Reply_Dispatcher.i \
- LF_Event.h \
- LF_Event.inl \
- GIOP_Message_Version.h \
- GIOP_Message_Version.inl \
- TAOC.h \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i \
- TAOC.i \
- operation_details.h \
- Service_Context.h \
- Service_Context.inl \
- target_specification.h \
- Object_KeyC.h \
- Object_KeyC.i \
- target_specification.i \
- operation_details.i \
- Invocation.i \
- PortableInterceptor.h \
- RequestInfo_Util.h \
- ClientRequestInfo_i.h \
- ClientRequestInfo_i.inl \
- ClientInterceptorAdapter.h \
- ClientInterceptorAdapter.inl
-
-.obj/Messaging_SyncScopeC.o .obj/Messaging_SyncScopeC.so .shobj/Messaging_SyncScopeC.o .shobj/Messaging_SyncScopeC.so: Messaging_SyncScopeC.cpp \
- Messaging_SyncScopeC.h \
- $(ACE_ROOT)/ace/pre.h \
+ Messaging_PolicyValueC.h $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -35245,8 +34785,7 @@ realclean:
  orbconf.h \
  varbase.h \
  TAO_Export.h \
- corbafwd.i \
- TAO_Export.h IOPC.h Exception.h \
+ corbafwd.i IOPC.h Exception.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
  $(ACE_ROOT)/ace/String_Base_Const.h \
@@ -35256,8 +34795,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Object.h \
+ Exception.i Object.h \
  Policy_ForwardC.h \
  Sequence.h \
  Managed_Types.h \
@@ -35278,9 +34816,8 @@ realclean:
  Typecode.h \
  Exception.h \
  Typecode.i \
- Any.i IOPC.i \
- Messaging_SyncScopeC.i \
- Stub.h \
+ Any.i IOPC.i Sequence.h \
+ Messaging_PolicyValueC.i Stub.h \
  MProfile.h \
  PolicyC.h \
  CurrentC.h \
@@ -35340,6 +34877,7 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
@@ -35406,13 +34944,6 @@ realclean:
  LF_Event.inl \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
- TAOC.h \
- TimeBaseC.h \
- SmartProxies/Smart_Proxies.h \
- SmartProxies/smartproxies_export.h \
- SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i \
- TAOC.i \
  operation_details.h \
  Service_Context.h \
  Service_Context.inl \
@@ -35968,38 +35499,30 @@ realclean:
  Object_KeyC.i \
  target_specification.i operation_details.i GIOP_Utils.h debug.h \
  ORB_Core.h ORB.h Exception.h Services.h \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- PolicyC.h CurrentC.h \
- CurrentC.i \
+ Services.i CORBA_String.h \
+ CORBA_String.inl PolicyC.h \
+ CurrentC.h CurrentC.i \
  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
  LocalObject.i \
  debug.h \
  Policy_Manager.i \
- Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
+ Resource_Factory.h $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- params.h \
+ $(ACE_ROOT)/ace/Service_Object.i params.h \
  CORBA_String.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -36007,14 +35530,13 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
  TAO_Export.h DynamicC.h DynamicC.i ObjectReferenceTemplateC.h \
  OctetSeqC.h Sequence.h OctetSeqC.i StringSeqC.h StringSeqC.i \
- ValueBase.h \
- ValueBase.i \
- ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Messaging_SyncScopeC.i PortableInterceptorC.i \
+ ValueBase.h ValueBase.i \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -36032,15 +35554,13 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Parser_Registry.h \
  Parser_Registry.i \
  Service_Callbacks.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
  $(ACE_ROOT)/ace/Array_Base.cpp \
  Cleanup_Func_Registry.inl Object_Ref_Table.h \
@@ -36064,9 +35584,8 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i Leader_Follower.h \
- LF_Follower.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
+ Leader_Follower.h LF_Follower.h \
  $(ACE_ROOT)/ace/Intrusive_List_Node.h \
  $(ACE_ROOT)/ace/Intrusive_List_Node.inl \
  $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \
@@ -36080,8 +35599,8 @@ realclean:
  TAO_Server_Request.h Tagged_Profile.h \
  GIOPC.h \
  GIOPC.i \
- Tagged_Profile.i \
- Object.h TAO_Server_Request.i GIOP_Message_Locate_Header.h \
+ Tagged_Profile.i Object.h \
+ TAO_Server_Request.i GIOP_Message_Locate_Header.h \
  Tagged_Profile.h \
  GIOP_Message_Locate_Header.i \
  Transport.h Transport_Descriptor_Interface.h \
@@ -36093,8 +35612,7 @@ realclean:
  $(ACE_ROOT)/ace/Recyclable.inl \
  Cache_Entries.inl \
  Transport_Cache_Manager.inl \
- Transport_Timer.h \
- $(ACE_ROOT)/ace/Refcountable.h \
+ Transport_Timer.h $(ACE_ROOT)/ace/Refcountable.h \
  $(ACE_ROOT)/ace/Refcountable.inl \
  Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
  Incoming_Message_Queue.inl Transport.inl LF_Strategy.h \
@@ -36664,8 +36182,7 @@ realclean:
  Exception.i \
  GIOP_Message_Generator_Parser.inl \
  GIOP_Message_Generator_Parser_10.inl \
- GIOP_Utils.h \
- Object.h \
+ GIOP_Utils.h Object.h \
  Policy_ForwardC.h \
  Sequence.h \
  Managed_Types.h \
@@ -36706,23 +36223,21 @@ realclean:
  TAO_Server_Request.h Tagged_Profile.h Object.h PICurrent.h \
  $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- PortableInterceptorC.h TAO_Export.h CurrentC.h \
- CurrentC.i \
+ $(ACE_ROOT)/ace/Array_Base.cpp PortableInterceptorC.h \
+ TAO_Export.h CurrentC.h CurrentC.i \
  DynamicC.h DynamicC.i ObjectReferenceTemplateC.h StringSeqC.h \
  StringSeqC.i ValueBase.h \
- ValueBase.i \
- Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Messaging_SyncScopeC.i PolicyC.h Policy_ForwardC.h \
+ ValueBase.i Exception.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h PolicyC.h Policy_ForwardC.h \
  Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i PortableInterceptorC.i LocalObject.h \
- LocalObject.i PICurrent.inl TAO_Server_Request.i GIOP_Message_State.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i PortableInterceptorC.i LocalObject.h LocalObject.i \
+ PICurrent.inl TAO_Server_Request.i GIOP_Message_State.h \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
  GIOP_Message_State.inl \
- CORBA_String.h \
- CORBA_String.inl
+ CORBA_String.h CORBA_String.inl
 
 .obj/GIOP_Message_Generator_Parser_11.o .obj/GIOP_Message_Generator_Parser_11.so .shobj/GIOP_Message_Generator_Parser_11.o .shobj/GIOP_Message_Generator_Parser_11.so: \
  GIOP_Message_Generator_Parser_11.cpp \
@@ -36951,8 +36466,7 @@ realclean:
  Exception.i \
  GIOP_Message_Generator_Parser.inl \
  GIOP_Message_Generator_Parser_12.inl \
- GIOP_Utils.h \
- Object.h \
+ GIOP_Utils.h Object.h \
  Policy_ForwardC.h \
  Sequence.h \
  Managed_Types.h \
@@ -36975,8 +36489,7 @@ realclean:
  Typecode.i \
  Any.i \
  IOPC.i \
- GIOP_Utils.i \
- GIOP_Message_State.h \
+ GIOP_Utils.i GIOP_Message_State.h \
  GIOP_Message_Version.h \
  GIOP_Message_Version.inl \
  GIOP_Message_State.inl \
@@ -36991,26 +36504,23 @@ realclean:
  operation_details.h corbafwd.h Service_Context.h \
  Service_Context.inl \
  target_specification.h target_specification.i operation_details.i \
- CDR.h Any.h debug.h OctetSeqC.h Sequence.h OctetSeqC.i \
- Pluggable_Messaging_Utils.h \
+ CDR.h Any.h debug.h Pluggable_Messaging_Utils.h \
  Pluggable_Messaging_Utils.i \
- TAO_Server_Request.h Tagged_Profile.h Object.h PICurrent.h \
+ TAO_Server_Request.h Tagged_Profile.h OctetSeqC.h Sequence.h \
+ OctetSeqC.i Object.h PICurrent.h \
  $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- PortableInterceptorC.h TAO_Export.h CurrentC.h \
- CurrentC.i \
+ $(ACE_ROOT)/ace/Array_Base.cpp PortableInterceptorC.h \
+ TAO_Export.h CurrentC.h CurrentC.i \
  DynamicC.h DynamicC.i ObjectReferenceTemplateC.h StringSeqC.h \
  StringSeqC.i ValueBase.h \
- ValueBase.i \
- Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Messaging_SyncScopeC.i PolicyC.h Policy_ForwardC.h \
+ ValueBase.i Exception.h \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h PolicyC.h Policy_ForwardC.h \
  Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i PortableInterceptorC.i LocalObject.h \
- LocalObject.i PICurrent.inl TAO_Server_Request.i TAOC.h \
- PolicyC.h \
- TimeBaseC.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i PortableInterceptorC.i LocalObject.h LocalObject.i \
+ PICurrent.inl TAO_Server_Request.i TAOC.h TimeBaseC.h \
  SmartProxies/Smart_Proxies.h \
  SmartProxies/smartproxies_export.h \
  TAO_Singleton.h \
@@ -37024,31 +36534,26 @@ realclean:
  TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
  SmartProxies/Smart_Proxies.inl \
- TimeBaseC.i TAOC.i \
- ORB_Core.h ORB.h Services.h \
- Services.i \
- CORBA_String.h \
+ TimeBaseC.i TAOC.i ORB_Core.h ORB.h Services.h \
+ Services.i CORBA_String.h \
  CORBA_String.inl \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
+ PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
  debug.h \
  Policy_Manager.i \
- Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
+ Resource_Factory.h $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- params.h \
+ $(ACE_ROOT)/ace/Service_Object.i params.h \
  CORBA_String.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- params.i \
- TAO_Singleton_Manager.h TAO_Singleton.h Adapter.h Adapter.i \
- PolicyFactory_Registry.h \
+ params.i TAO_Singleton_Manager.h \
+ TAO_Singleton.h Adapter.h Adapter.i PolicyFactory_Registry.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -37066,8 +36571,7 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Parser_Registry.h \
  Parser_Registry.i \
  Service_Callbacks.h \
  Service_Callbacks.i \
@@ -37093,8 +36597,8 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i Transport.h Transport_Descriptor_Interface.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
+ Transport.h Transport_Descriptor_Interface.h \
  Transport_Descriptor_Interface.inl \
  Transport_Cache_Manager.h \
  Cache_Entries.h \
@@ -37103,8 +36607,7 @@ realclean:
  $(ACE_ROOT)/ace/Recyclable.inl \
  Cache_Entries.inl \
  Transport_Cache_Manager.inl \
- Transport_Timer.h \
- $(ACE_ROOT)/ace/Refcountable.h \
+ Transport_Timer.h $(ACE_ROOT)/ace/Refcountable.h \
  $(ACE_ROOT)/ace/Refcountable.inl \
  Incoming_Message_Queue.h Incoming_Message_Queue.inl Transport.inl
 
@@ -37471,8 +36974,8 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i \
- Transport.h corbafwd.h Exception.h Transport_Descriptor_Interface.h \
+ ORB_Core.i Transport.h corbafwd.h \
+ Exception.h Transport_Descriptor_Interface.h \
  Transport_Descriptor_Interface.inl \
  Transport_Cache_Manager.h \
  Cache_Entries.h \
@@ -37960,9 +37463,9 @@ realclean:
  ValueBase.i \
  ObjectReferenceTemplateC.i \
  Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i \
  IOPC.h \
  IOPC.i \
- Messaging_SyncScopeC.i \
  PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -38029,8 +37532,7 @@ realclean:
  GIOP_Message_Base.i
 
 .obj/GIOP_Message_Version.o .obj/GIOP_Message_Version.so .shobj/GIOP_Message_Version.o .shobj/GIOP_Message_Version.so: GIOP_Message_Version.cpp \
- GIOP_Message_Version.h \
- $(ACE_ROOT)/ace/pre.h \
+ GIOP_Message_Version.h $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -38261,40 +37763,32 @@ realclean:
  Object_KeyC.h \
  Object_KeyC.i \
  GIOPC.i \
- Tagged_Profile.i \
- ORB_Core.h corbafwd.h ORB.h Exception.h Services.h \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- PolicyC.h CurrentC.h \
- CurrentC.i \
+ Tagged_Profile.i ORB_Core.h \
+ corbafwd.h ORB.h Exception.h Services.h \
+ Services.i CORBA_String.h \
+ CORBA_String.inl PolicyC.h \
+ CurrentC.h CurrentC.i \
  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
- Object_Proxy_Impl.h \
- Encodable.h PolicyC.i \
- ORB.i \
- Environment.h Policy_Manager.h \
- Policy_Set.h \
+ Object_Proxy_Impl.h Encodable.h \
+ PolicyC.i ORB.i Environment.h \
+ Policy_Manager.h Policy_Set.h \
  PolicyC.h \
  Policy_Set.i \
  LocalObject.h \
  LocalObject.i \
  debug.h \
  Policy_Manager.i \
- Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
+ Resource_Factory.h $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- params.h \
+ $(ACE_ROOT)/ace/Service_Object.i params.h \
  CORBA_String.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- params.i \
- TAO_Singleton_Manager.h \
+ params.i TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
+ TAO_Singleton.h TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -38302,14 +37796,13 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- TAO_Singleton_Manager.h \
- Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
+ TAO_Singleton_Manager.h Adapter.h \
+ Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
  TAO_Export.h DynamicC.h DynamicC.i ObjectReferenceTemplateC.h \
  OctetSeqC.h Sequence.h OctetSeqC.i StringSeqC.h StringSeqC.i \
- ValueBase.h \
- ValueBase.i \
- ObjectReferenceTemplateC.i Messaging_SyncScopeC.h IOPC.h \
- Messaging_SyncScopeC.i PortableInterceptorC.i \
+ ValueBase.h ValueBase.i \
+ ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+ Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -38327,15 +37820,13 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Parser_Registry.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Parser_Registry.h \
  Parser_Registry.i \
  Service_Callbacks.h \
  Service_Callbacks.i \
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
- Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
+ Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
  $(ACE_ROOT)/ace/Array_Base.cpp \
  Cleanup_Func_Registry.inl Object_Ref_Table.h \
@@ -38359,12 +37850,12 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- ORB_Core.i Acceptor_Registry.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
+ Acceptor_Registry.h \
  Resource_Factory.h \
  Acceptor_Registry.i \
  Transport_Acceptor.h Transport_Acceptor.inl Thread_Lane_Resources.h \
- Thread_Lane_Resources.i \
- debug.h target_specification.h target_specification.i
+ Thread_Lane_Resources.i debug.h \
+ target_specification.h target_specification.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/Messaging/Makefile b/TAO/tao/Messaging/Makefile
index e08023a1143..84348dbcbd9 100644
--- a/TAO/tao/Messaging/Makefile
+++ b/TAO/tao/Messaging/Makefile
@@ -58,13 +58,11 @@ CPPFLAGS += -I$(TAO_ROOT)
 
 
 .obj/Twoway_Asynch_Invocation.o .obj/Twoway_Asynch_Invocation.so .shobj/Twoway_Asynch_Invocation.o .shobj/Twoway_Asynch_Invocation.so: Twoway_Asynch_Invocation.cpp \
- Twoway_Asynch_Invocation.h \
- $(ACE_ROOT)/ace/pre.h Messaging.h \
- messaging_export.h \
+ Twoway_Asynch_Invocation.h $(ACE_ROOT)/ace/pre.h \
+ Messaging.h messaging_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- MessagingC.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl MessagingC.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/ACE_export.h \
@@ -217,10 +215,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
- MessagingC.i Asynch_Reply_Dispatcher.h Asynch_Timeout_Handler.h \
+ MessagingC.i $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i Asynch_Reply_Dispatcher.h \
+ Asynch_Timeout_Handler.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.h \
  $(TAO_ROOT)/tao/Transport.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
@@ -266,6 +264,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Refcountable.inl \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
  $(TAO_ROOT)/tao/Transport.inl \
@@ -280,8 +280,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/LF_Event.inl \
  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
  $(TAO_ROOT)/tao/Service_Context.h \
  $(TAO_ROOT)/tao/Service_Context.inl \
@@ -292,8 +290,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/Asynch_Invocation.i \
- Twoway_Asynch_Invocation.i \
- $(TAO_ROOT)/tao/Stub.h \
+ Twoway_Asynch_Invocation.i $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -362,13 +359,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h
 
 .obj/Asynch_Reply_Dispatcher.o .obj/Asynch_Reply_Dispatcher.so .shobj/Asynch_Reply_Dispatcher.o .shobj/Asynch_Reply_Dispatcher.so: Asynch_Reply_Dispatcher.cpp \
- Asynch_Reply_Dispatcher.h \
- $(ACE_ROOT)/ace/pre.h Messaging.h \
- messaging_export.h \
+ Asynch_Reply_Dispatcher.h $(ACE_ROOT)/ace/pre.h \
+ Messaging.h messaging_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- MessagingC.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl MessagingC.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/ACE_export.h \
@@ -521,10 +516,9 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
- MessagingC.i Asynch_Timeout_Handler.h \
+ MessagingC.i $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i Asynch_Timeout_Handler.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.h \
  $(TAO_ROOT)/tao/Transport.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
@@ -570,6 +564,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Refcountable.inl \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
  $(TAO_ROOT)/tao/Transport.inl \
@@ -641,9 +637,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/ORB_Core.i
 
 .obj/Asynch_Timeout_Handler.o .obj/Asynch_Timeout_Handler.so .shobj/Asynch_Timeout_Handler.o .shobj/Asynch_Timeout_Handler.so: Asynch_Timeout_Handler.cpp \
- Asynch_Timeout_Handler.h \
- $(ACE_ROOT)/ace/pre.h \
- messaging_export.h \
+ Asynch_Timeout_Handler.h $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -800,10 +794,9 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
- MessagingC.i \
+ MessagingC.i $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.h \
  $(TAO_ROOT)/tao/Transport.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
@@ -849,6 +842,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Refcountable.inl \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
  $(TAO_ROOT)/tao/Transport.inl \
@@ -859,12 +854,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h
 
 .obj/Messaging.o .obj/Messaging.so .shobj/Messaging.o .shobj/Messaging.so: Messaging.cpp Messaging.h \
- $(ACE_ROOT)/ace/pre.h \
- messaging_export.h \
+ $(ACE_ROOT)/ace/pre.h messaging_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- MessagingC.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl MessagingC.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/ACE_export.h \
@@ -1017,10 +1010,9 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
- MessagingC.i Messaging_ORBInitializer.h \
+ MessagingC.i $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i Messaging_ORBInitializer.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
  $(TAO_ROOT)/tao/DynamicC.i \
@@ -1030,6 +1022,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
@@ -1119,12 +1113,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Stub.i
 
 .obj/MessagingC.o .obj/MessagingC.so .shobj/MessagingC.o .shobj/MessagingC.so: MessagingC.cpp Messaging.h \
- $(ACE_ROOT)/ace/pre.h \
- messaging_export.h \
+ $(ACE_ROOT)/ace/pre.h messaging_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- MessagingC.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl MessagingC.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/ACE_export.h \
@@ -1277,10 +1269,9 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
- MessagingC.i \
+ MessagingC.i $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
@@ -1320,6 +1311,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -1385,8 +1378,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/LF_Event.inl \
  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
  $(TAO_ROOT)/tao/Service_Context.h \
  $(TAO_ROOT)/tao/Service_Context.inl \
@@ -1404,12 +1395,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
 .obj/MessagingS.o .obj/MessagingS.so .shobj/MessagingS.o .shobj/MessagingS.so: MessagingS.cpp MessagingS.h \
- $(ACE_ROOT)/ace/pre.h \
- messaging_export.h \
+ $(ACE_ROOT)/ace/pre.h messaging_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- Messaging.h MessagingC.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl Messaging.h MessagingC.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/ACE_export.h \
@@ -1562,10 +1551,9 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
- MessagingC.i \
+ MessagingC.i $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/PortableServer/PolicyS.h \
  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
@@ -1589,8 +1577,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TimeBaseS_T.h \
  $(TAO_ROOT)/tao/TimeBaseS_T.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- MessagingS_T.h MessagingS_T.i MessagingS_T.cpp MessagingS.i \
+ $(TAO_ROOT)/tao/TimeBaseS.i MessagingS_T.h \
+ MessagingS_T.i MessagingS_T.cpp MessagingS.i \
  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
  $(ACE_ROOT)/ace/Map.h \
@@ -1661,6 +1649,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
  $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
@@ -1738,8 +1728,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
 .obj/Messaging_ORBInitializer.o .obj/Messaging_ORBInitializer.so .shobj/Messaging_ORBInitializer.o .shobj/Messaging_ORBInitializer.so: Messaging_ORBInitializer.cpp \
- Messaging_ORBInitializer.h \
- $(ACE_ROOT)/ace/pre.h \
+ Messaging_ORBInitializer.h $(ACE_ROOT)/ace/pre.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -1833,8 +1822,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- messaging_export.h \
+ $(TAO_ROOT)/tao/corbafwd.i messaging_export.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
@@ -1881,9 +1869,9 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
@@ -1891,8 +1879,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- Messaging_Policy_i.h \
+ $(TAO_ROOT)/tao/LocalObject.i Messaging_Policy_i.h \
  Messaging.h \
  messaging_export.h \
  MessagingC.h \
@@ -1916,6 +1903,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  MessagingC.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
  Messaging_Policy_i.i \
  Messaging_PolicyFactory.h \
  $(TAO_ROOT)/tao/ORB_Core.h \
@@ -2000,8 +1989,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/ORB_Core.i
 
 .obj/Messaging_PolicyFactory.o .obj/Messaging_PolicyFactory.so .shobj/Messaging_PolicyFactory.o .shobj/Messaging_PolicyFactory.so: Messaging_PolicyFactory.cpp \
- Messaging_PolicyFactory.h \
- $(ACE_ROOT)/ace/pre.h \
+ Messaging_PolicyFactory.h $(ACE_ROOT)/ace/pre.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -2095,8 +2083,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- messaging_export.h \
+ $(TAO_ROOT)/tao/corbafwd.i messaging_export.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
@@ -2143,9 +2130,9 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
@@ -2153,8 +2140,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- Messaging_Policy_i.h \
+ $(TAO_ROOT)/tao/LocalObject.i Messaging_Policy_i.h \
  Messaging.h \
  messaging_export.h \
  MessagingC.h \
@@ -2178,10 +2164,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  MessagingC.i \
- Messaging_Policy_i.i \
- $(TAO_ROOT)/tao/Buffering_Constraint_Policy.h \
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/TAOC.i \
+ Messaging_Policy_i.i \
+ $(TAO_ROOT)/tao/Buffering_Constraint_Policy.h \
  $(TAO_ROOT)/tao/Buffering_Constraint_Policy.i
 
 .obj/Messaging_Policy_i.o .obj/Messaging_Policy_i.so .shobj/Messaging_Policy_i.o .shobj/Messaging_Policy_i.so: Messaging_Policy_i.cpp \
@@ -2345,10 +2331,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  MessagingC.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  Messaging_Policy_i.i \
@@ -2389,6 +2375,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
diff --git a/TAO/tao/Messaging_SyncScopeC.cpp b/TAO/tao/Messaging_SyncScopeC.cpp
index 631667e1477..3641e838993 100644
--- a/TAO/tao/Messaging_SyncScopeC.cpp
+++ b/TAO/tao/Messaging_SyncScopeC.cpp
@@ -21,15 +21,7 @@
 
 #include "Messaging_SyncScopeC.h"
 
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -43,18 +35,18 @@ static const CORBA::Long _oc_Messaging_SyncScope[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5379), 
-  ACE_NTOHL (0x6e635363), 
-  ACE_NTOHL (0x6f70653a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5379),
+  ACE_NTOHL (0x6e635363),
+  ACE_NTOHL (0x6f70653a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/SyncScope:1.0
   10,
-  ACE_NTOHL (0x53796e63), 
-  ACE_NTOHL (0x53636f70), 
+  ACE_NTOHL (0x53796e63),
+  ACE_NTOHL (0x53636f70),
   ACE_NTOHL (0x65000000),  // name = SyncScope
   CORBA::tk_short,
 
@@ -89,11 +81,3 @@ TAO_NAMESPACE_TYPE (const CORBA::Short)
 TAO_NAMESPACE_BEGIN (Messaging)
 TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_TARGET, 3)
 TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_EAGER_BUFFERING, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_DELAYED_BUFFERING, -2)
-TAO_NAMESPACE_END
diff --git a/TAO/tao/Messaging_SyncScopeC.h b/TAO/tao/Messaging_SyncScopeC.h
index e0999e41025..a9f44b15b5e 100644
--- a/TAO/tao/Messaging_SyncScopeC.h
+++ b/TAO/tao/Messaging_SyncScopeC.h
@@ -23,15 +23,13 @@
 #define _TAO_IDL_ORIG_MESSAGING_SYNCSCOPEC_H_
 
 #include "ace/pre.h"
-#include "tao/corbafwd.h"
+
+#include "corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
-#include "IOPC.h"
-
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -60,20 +58,16 @@ TAO_NAMESPACE  Messaging
   typedef CORBA::Short SyncScope;
   typedef CORBA::Short_out SyncScope_out;
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SyncScope;
-  
+
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_NONE;
-  
+
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TRANSPORT;
-  
+
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_SERVER;
-  
+
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TARGET;
-  
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_EAGER_BUFFERING;
-  
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_DELAYED_BUFFERING;
-  
-  
+
+
 }
 TAO_NAMESPACE_CLOSE // module Messaging
 
diff --git a/TAO/tao/Messaging_SyncScopeC.i b/TAO/tao/Messaging_SyncScopeC.i
index f455a06b8f0..95f0b8ea192 100644
--- a/TAO/tao/Messaging_SyncScopeC.i
+++ b/TAO/tao/Messaging_SyncScopeC.i
@@ -18,4 +18,3 @@
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
-
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
index 83c376dfba2..c13000fcc4c 100644
--- a/TAO/tao/NVList.cpp
+++ b/TAO/tao/NVList.cpp
@@ -454,12 +454,20 @@ CORBA_NVList::_lazy_has_arguments (void) const
 template class ACE_Node<CORBA::NamedValue_ptr>;
 template class ACE_Unbounded_Queue<CORBA::NamedValue_ptr>;
 template class ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr>;
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
 template class ACE_Auto_Basic_Ptr<TAO_InputCDR>;
+#  endif  /* ACE_LACKS_AUTO_PTR */
 template class auto_ptr<TAO_InputCDR>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Node<CORBA::NamedValue_ptr>
 #pragma instantiate ACE_Unbounded_Queue<CORBA::NamedValue_ptr>
 #pragma instantiate ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_InputCDR>
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_InputCDR>
+#  endif  /* ACE_LACKS_AUTO_PTR */
 #pragma instantiate auto_ptr<TAO_InputCDR>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 106bc2961e6..96391e5665d 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -82,7 +82,8 @@ int CORBA_ORB::orb_init_count_ = 0;
 // ****************************************************************
 
 CORBA::ORB::InvalidName::InvalidName (void)
-  : CORBA_UserException ("IDL:omg.org/CORBA/ORB/InvalidName:1.0")
+  : CORBA_UserException ("IDL:omg.org/CORBA/ORB/InvalidName:1.0",
+                         "InvalidName")
 {
 }
 
@@ -93,7 +94,8 @@ CORBA::ORB::InvalidName::~InvalidName (void)
 
 // Copy constructor.
 CORBA::ORB::InvalidName::InvalidName (const ::CORBA::ORB::InvalidName &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (_tao_excp._rep_id (),
+                         _tao_excp._name ())
 {
 }
 
@@ -108,7 +110,7 @@ CORBA::ORB::InvalidName::operator= (const ::CORBA::ORB::InvalidName &_tao_excp)
 CORBA::ORB::InvalidName *
 CORBA::ORB::InvalidName::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/ORB/InvalidName:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/ORB/InvalidName:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (InvalidName *, exc);
     }
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp
index bcaa3b1bfc2..0d5e0aa25ac 100644
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ b/TAO/tao/ORBInitializer_Registry.cpp
@@ -1,17 +1,16 @@
-// -*- C++ -*-
-//
-// $Id$
-
 #include "ORBInitializer_Registry.h"
 #include "ORB.h"
 #include "TAO_Singleton_Manager.h"
+#include "TAO_Singleton.h"
 #include "ace/Object_Manager.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/ORBInitializer_Registry.inl"
-#endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(tao, ORBInitializer_Registry, "$Id$")
+ACE_RCSID (tao,
+           ORBInitializer_Registry,
+           "$Id$")
+
+
+// ****************************************************************
 
 
 void
@@ -114,6 +113,13 @@ TAO_ORBInitializer_Registry::post_init (
     }
 }
 
+TAO_ORBInitializer_Registry *
+TAO_ORBInitializer_Registry::instance (void)
+{
+  return
+    TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX>::instance ();
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX>;
diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h
index 82ec0bb2384..7516db45f8d 100644
--- a/TAO/tao/ORBInitializer_Registry.h
+++ b/TAO/tao/ORBInitializer_Registry.h
@@ -22,7 +22,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "PortableInterceptorC.h"
-#include "TAO_Singleton.h"
 #include "ace/Array_Base.h"
 
 /**
@@ -30,10 +29,17 @@
  *
  * @brief Global list that contains all portable interceptor ORB
  *        initializers.
+ *
+ * @note This class should be instantiated via its instance() method.
+ *       Normally this would be enforced by making the constructor
+ *       protected but that forces a friend declaration containing a
+ *       template type (TAO_Singleton) with a static member to be
+ *       introduced.  In turn, this potentially introduces problems in
+ *       MS Windows DLL environments due to the occurance of multiple
+ *       singleton instances.  There should only be one!
  */
 class TAO_Export TAO_ORBInitializer_Registry
 {
-  friend class TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX>;
   friend void PortableInterceptor::register_orb_initializer (
                   PortableInterceptor::ORBInitializer_ptr init
                                   ACE_ENV_ARG_DECL_NOT_USED);
@@ -42,17 +48,23 @@ class TAO_Export TAO_ORBInitializer_Registry
                                          const char *,
                                          CORBA_Environment &);
 
-protected:
+public:
 
   /// Only allow this class to be instantiated as a singleton
   /// instance, so declare the constructor as protected.
+  /**
+   * @note See the note in the class description for an explanation of
+   *       why this constructor is not protected.
+   */
   TAO_ORBInitializer_Registry (void);
 
   /// Destructor.  Releases duplicated ORBInitializer references.
   ~TAO_ORBInitializer_Registry (void);
 
-  ///< Register an ORBInitializer with the underlying ORBInitializer
-  ///< array.
+protected:
+
+  /// Register an ORBInitializer with the underlying ORBInitializer
+  /// array.
   void register_orb_initializer (
     PortableInterceptor::ORBInitializer_ptr init
     ACE_ENV_ARG_DECL);
@@ -84,25 +96,6 @@ private:
 
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/ORBInitializer_Registry.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (_MSC_VER)
-// Disable "nonstandard extension used : 'extern' before template
-// explicit instantiation" warning.
-#pragma warning(disable:4231)
-#endif /* _MSC_VER */
-
-TAO_SINGLETON_DECLARE (TAO_Singleton,
-                       TAO_ORBInitializer_Registry,
-                       TAO_SYNCH_MUTEX)
-
-#if defined (_MSC_VER)
-// Re-enable the warning.
-#pragma warning(default:4231)
-#endif /* _MSC_VER */
-
 #include "ace/post.h"
 
 #endif /* TAO_ORB_INITIALIZER_REGISTRY_H */
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 23f4692dc9f..ec8412b8202 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -245,7 +245,7 @@ TAO_ORB_Core::~TAO_ORB_Core (void)
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
-CORBA::Policy *
+CORBA::Policy_ptr
 TAO_ORB_Core::default_buffering_constraint (void) const
 {
   return this->default_policies_->
@@ -1824,6 +1824,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
       // contains references to objects, which themselves may contain
       // reference to this ORB.
       this->object_ref_table_.destroy ();
+      this->pi_current_ = 0;  // For the sake of consistency.
     }
 }
 
@@ -1845,7 +1846,8 @@ TAO_ORB_Core::destroy (ACE_ENV_SINGLE_ARG_DECL)
   //
 
   // Shutdown the ORB and block until the shutdown is complete.
-  this->shutdown (1 ACE_ENV_ARG_PARAMETER);
+  this->shutdown (1
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now remove it from the ORB table so that it's ORBid may be
@@ -1860,38 +1862,79 @@ TAO_ORB_Core::destroy (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
 {
-  size_t len = 0;
+  size_t len = 0;   // The length of the interceptor array.
+  size_t ilen = 0;  // The incremental length of the interceptor array.
 
 #if TAO_HAS_INTERCEPTORS == 1
   TAO_ClientRequestInterceptor_List::TYPE &client_interceptors =
     this->client_request_interceptors_.interceptors ();
 
   len = client_interceptors.size ();
+  ilen = len;
   for (size_t i = 0; i < len; ++i)
     {
-      client_interceptors[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      // Destroy the interceptors in reverse order in case the array
+      // list is only partially destroyed and another invocation
+      // occurs afterwards.
+      --ilen;
+
+      client_interceptors[ilen]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
+
+      // Since Interceptor::destroy() can throw an exception, decrease
+      // the size of the interceptor array incrementally since some
+      // interceptors may not have been destroyed yet.  Note that this
+      // size reduction is fast since no memory is actually
+      // deallocated.
+      client_interceptors.size (ilen);
     }
 
   TAO_ServerRequestInterceptor_List::TYPE &server_interceptors =
     this->server_request_interceptors_.interceptors ();
 
   len = server_interceptors.size ();
+  ilen = len;
   for (size_t j = 0; j < len; ++j)
     {
-      server_interceptors[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      // Destroy the interceptors in reverse order in case the array
+      // list is only partially destroyed and another invocation
+      // occurs afterwards.
+      --ilen;
+
+      server_interceptors[ilen]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
+
+      // Since Interceptor::destroy() can throw an exception, decrease
+      // the size of the interceptor array incrementally since some
+      // interceptors may not have been destroyed yet.  Note that this
+      // size reduction is fast since no memory is actually
+      // deallocated.
+      server_interceptors.size (ilen);
     }
+
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
   TAO_IORInterceptor_List::TYPE &ior_interceptors =
     this->ior_interceptors_.interceptors ();
 
   len = ior_interceptors.size ();
+  ilen = len;
   for (size_t k = 0; k < len; ++k)
     {
-      ior_interceptors[k]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      // Destroy the interceptors in reverse order in case the array
+      // list is only partially destroyed and another invocation
+      // occurs afterwards.
+      --ilen;
+
+      ior_interceptors[ilen]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
+
+      // Since Interceptor::destroy() can throw an exception, decrease
+      // the size of the interceptor array incrementally since some
+      // interceptors may not have been destroyed yet.  Note that this
+      // size reduction is fast since no memory is actually
+      // deallocated.
+      ior_interceptors.size (ilen);
     }
 }
 
@@ -2513,7 +2556,7 @@ TAO_ORB_Core::implrepo_service (void)
 void
 TAO_ORB_Core::call_sync_scope_hook (TAO_Stub *stub,
                                     int &has_synchronization,
-                                    int &scope)
+                                    Messaging::SyncScope &scope)
 {
   if (TAO_ORB_Core::sync_scope_hook_ == 0)
     {
@@ -2526,18 +2569,18 @@ TAO_ORB_Core::call_sync_scope_hook (TAO_Stub *stub,
 
 TAO_Sync_Strategy &
 TAO_ORB_Core::get_sync_strategy (TAO_Stub *,
-                                 int &scope)
+                                 Messaging::SyncScope &scope)
 {
 
-  if (scope == TAO::SYNC_WITH_TRANSPORT ||
-      scope == TAO::SYNC_WITH_SERVER ||
-      scope == TAO::SYNC_WITH_TARGET)
+  if (scope == Messaging::SYNC_WITH_TRANSPORT
+      || scope == Messaging::SYNC_WITH_SERVER
+      || scope == Messaging::SYNC_WITH_TARGET)
     return this->transport_sync_strategy ();
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
-  if (scope == TAO::SYNC_NONE ||
-      scope == TAO::SYNC_EAGER_BUFFERING)
+  if (scope == Messaging::SYNC_NONE
+      || scope == TAO::SYNC_EAGER_BUFFERING)
     return this->eager_buffering_sync_strategy ();
 
   if (scope == TAO::SYNC_DELAYED_BUFFERING)
@@ -2557,9 +2600,11 @@ TAO_ORB_Core::set_sync_scope_hook (Sync_Scope_Hook hook)
 
 #if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
 
-void
-TAO_ORB_Core::stubless_sync_scope (CORBA::Policy *&result)
+CORBA::Policy_ptr
+TAO_ORB_Core::stubless_sync_scope (void)
 {
+  CORBA::Policy_var result;
+
   // No need to lock, the object is in TSS storage....
   TAO_Policy_Current &policy_current =
     this->policy_current ();
@@ -2568,18 +2613,20 @@ TAO_ORB_Core::stubless_sync_scope (CORBA::Policy *&result)
   // @@ Must lock, but is is harder to implement than just modifying
   //    this call: the ORB does take a lock to modify the policy
   //    manager
-  if (result == 0)
+  if (CORBA::is_nil (result.in ()))
     {
       TAO_Policy_Manager *policy_manager =
         this->policy_manager ();
       if (policy_manager != 0)
-        result = policy_manager->get_cached_policy (TAO_CACHED_POLICY_SYNC_SCOPE);
+        result = policy_manager->get_cached_policy (
+                   TAO_CACHED_POLICY_SYNC_SCOPE);
     }
 
-  if (result == 0)
-    result = this->default_policies_->get_cached_policy (TAO_CACHED_POLICY_SYNC_SCOPE);
+  if (CORBA::is_nil (result.in ()))
+    result = this->default_policies_->get_cached_policy (
+               TAO_CACHED_POLICY_SYNC_SCOPE);
 
-  return;
+  return result._retn ();
 }
 
 #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
@@ -2606,45 +2653,49 @@ TAO_ORB_Core::set_timeout_hook (Timeout_Hook hook)
   return;
 }
 
-CORBA::Policy *
+CORBA::Policy_ptr
 TAO_ORB_Core::stubless_relative_roundtrip_timeout (void)
 {
-  CORBA::Policy *result = 0;
+  CORBA::Policy_var result;
 
-#if (TAO_HAS_CORBA_MESSAGING == 1 && TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
+#if (TAO_HAS_CORBA_MESSAGING == 1 \
+     && TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
 
   // No need to lock, the object is in TSS storage....
   TAO_Policy_Current &policy_current =
     this->policy_current ();
-  result = policy_current.get_cached_policy (TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
+  result = policy_current.get_cached_policy (
+             TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
 
   // @@ Must lock, but is is harder to implement than just modifying
   //    this call: the ORB does take a lock to modify the policy
   //    manager
-  if (result == 0)
+  if (CORBA::is_nil (result.in ()))
     {
       TAO_Policy_Manager *policy_manager =
         this->policy_manager ();
       if (policy_manager != 0)
-        result = policy_manager->get_cached_policy (TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
+        result = policy_manager->get_cached_policy (
+          TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
     }
 
-  if (result == 0)
-    result = this->default_policies_->get_cached_policy (TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
+  if (CORBA::is_nil (result.in ()))
+    result = this->default_policies_->get_cached_policy (
+               TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
 
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 && TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
-
-  return result;
+#endif /* TAO_HAS_CORBA_MESSAGING == 1
+          && TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
+  return result._retn ();
 }
 
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
-CORBA::Policy *
+CORBA::Policy_ptr
 TAO_ORB_Core::get_cached_policy (TAO_Cached_Policy_Type type)
 {
-  CORBA::Policy *result = 0;
+  CORBA::Policy_var result;
 
   // @@ Must lock, but is is harder to implement than just modifying
   //    this call: the ORB does take a lock to modify the policy
@@ -2654,10 +2705,10 @@ TAO_ORB_Core::get_cached_policy (TAO_Cached_Policy_Type type)
   if (policy_manager != 0)
     result = policy_manager->get_cached_policy (type);
 
-  if (result == 0)
+  if (CORBA::is_nil (result.in ()))
     result = this->get_default_policies ()->get_cached_policy (type);
 
-  return result;
+  return result._retn ();
 }
 
 #endif /* (TAO_HAS_CORBA_MESSAGING == 1) */
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 11ea80abc3f..4c48cf8766c 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -497,7 +497,7 @@ public:
 
   /// Get a cached policy.  First, check the ORB-level Policy
   /// Manager, and then check the ORB defaults.
-  CORBA::Policy *get_cached_policy (TAO_Cached_Policy_Type type);
+  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -560,24 +560,29 @@ public:
   /// Access to the RoundtripTimeoutPolicy policy set on the thread or
   /// on the ORB.  In this method, we do not consider the stub since
   /// we do not have access to it.
-  CORBA::Policy *stubless_relative_roundtrip_timeout (void);
+  CORBA::Policy_ptr stubless_relative_roundtrip_timeout (void);
 
   void call_sync_scope_hook (TAO_Stub *stub,
                              int &has_synchronization,
-                             int &scope);
+                             Messaging::SyncScope &scope);
   TAO_Sync_Strategy &get_sync_strategy (TAO_Stub *stub,
-                                        int &scope);
-  typedef void (*Sync_Scope_Hook) (TAO_ORB_Core *, TAO_Stub *, int&, int&);
+                                        Messaging::SyncScope &scope);
+  typedef void (*Sync_Scope_Hook) (TAO_ORB_Core *,
+                                   TAO_Stub *,
+                                   int &,
+                                   Messaging::SyncScope &);
   static void set_sync_scope_hook (Sync_Scope_Hook hook);
 
-  void stubless_sync_scope (CORBA::Policy *&result);
+#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
+  CORBA::Policy_ptr stubless_sync_scope (void);
+#endif  /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
 
   static Sync_Scope_Hook sync_scope_hook_;
   // The hook to be set for the SyncScopePolicy
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
-  CORBA::Policy *default_buffering_constraint (void) const;
+  CORBA::Policy_ptr default_buffering_constraint (void) const;
 
   /// This strategy will buffer messages.
   //@{
diff --git a/TAO/tao/ORB_Table.cpp b/TAO/tao/ORB_Table.cpp
index 126b08095fd..12ac9358b70 100644
--- a/TAO/tao/ORB_Table.cpp
+++ b/TAO/tao/ORB_Table.cpp
@@ -1,9 +1,6 @@
-// -*- C++ -*-
-//
-// $Id$
-
 #include "ORB_Table.h"
 #include "ORB_Core.h"
+#include "TAO_Singleton.h"
 
 #if !defined (__ACE_INLINE__)
 # include "ORB_Table.inl"
@@ -129,6 +126,12 @@ TAO_ORB_Table::unbind (const char *orb_id)
   return result;
 }
 
+TAO_ORB_Table *
+TAO_ORB_Table::instance (void)
+{
+  return TAO_Singleton<TAO_ORB_Table, TAO_SYNCH_MUTEX>::instance ();
+}
+
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h
index 9adda3bb185..b9ba19df5c4 100644
--- a/TAO/tao/ORB_Table.h
+++ b/TAO/tao/ORB_Table.h
@@ -23,13 +23,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/orbconf.h"
-#include "tao/TAO_Singleton.h"
 #include "ace/Synch.h"
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/Functor.h"
 
-
 // Forward declarations.
 class TAO_ORB_Core;
 
@@ -44,12 +41,26 @@ class TAO_ORB_Core;
  * This class is used to implement that feature.
  * It is also useful when trying to determine if an object
  * reference is collocated or not.
+ *
+ * @note This class should be instantiated via its instance() method.
+ *       Normally this would be enforced by making the constructor
+ *       protected but that forces a friend declaration containing a
+ *       template type (TAO_Singleton) with a static member to be
+ *       introduced.  In turn, this potentially introduces problems in
+ *       MS Windows DLL environments due to the occurance of multiple
+ *       singleton instances.  There should only be one!
  */
 class TAO_Export TAO_ORB_Table
 {
-  friend class TAO_Singleton<TAO_ORB_Table, TAO_SYNCH_MUTEX>;
-
 public:
+
+  /// Constructor
+  /**
+   * @note See the note in the class description for an explanation of
+   *       why this constructor is not protected.
+   */
+  TAO_ORB_Table (void);
+
   /// destructor
   ~TAO_ORB_Table (void);
 
@@ -71,11 +82,6 @@ public:
   /// Return a unique instance
   static TAO_ORB_Table *instance (void);
 
-protected:
-
-  /// Constructor
-  TAO_ORB_Table (void);
-
 private:
 
   /// Prevent copying
@@ -96,19 +102,6 @@ private:
 # include "tao/ORB_Table.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (_MSC_VER)
-// Disable "nonstandard extension used : 'extern' before template
-// explicit instantiation" warning.
-#pragma warning(disable:4231)
-#endif /* _MSC_VER */
-
-TAO_SINGLETON_DECLARE (TAO_Singleton, TAO_ORB_Table, TAO_SYNCH_MUTEX)
-
-#if defined (_MSC_VER)
-// Re-enable the warning.
-#pragma warning(default:4231)
-#endif /* _MSC_VER */
-
 #include "ace/post.h"
 
 #endif  /* TAO_ORB_TABLE_H */
diff --git a/TAO/tao/ORB_Table.inl b/TAO/tao/ORB_Table.inl
index bb93d4ef56a..f1aedccc4df 100644
--- a/TAO/tao/ORB_Table.inl
+++ b/TAO/tao/ORB_Table.inl
@@ -2,12 +2,6 @@
 //
 // $Id$
 
-ACE_INLINE TAO_ORB_Table *
-TAO_ORB_Table::instance (void)
-{
-  return TAO_Singleton<TAO_ORB_Table, TAO_SYNCH_MUTEX>::instance ();
-}
-
 ACE_INLINE TAO_ORB_Core *
 TAO_ORB_Table::first_orb (void)
 {
diff --git a/TAO/tao/PICurrent.cpp b/TAO/tao/PICurrent.cpp
index df04f49fd11..6bdfa8af5e9 100644
--- a/TAO/tao/PICurrent.cpp
+++ b/TAO/tao/PICurrent.cpp
@@ -238,6 +238,8 @@ TAO_PICurrent_Impl::copy (TAO_PICurrent_Impl &rhs, CORBA::Boolean deep_copy)
       this->lc_slot_table_ = &rhs.slot_table ();  // Shallow copy
 
       this->pi_peer_ = &rhs;
+
+      this->dirty_ = 1;
     }
 }
 
diff --git a/TAO/tao/PICurrent.inl b/TAO/tao/PICurrent.inl
index 7e25c8d110e..442694c6137 100644
--- a/TAO/tao/PICurrent.inl
+++ b/TAO/tao/PICurrent.inl
@@ -35,7 +35,7 @@ TAO_PICurrent_Impl::pi_peer (TAO_PICurrent_Impl *peer)
 ACE_INLINE TAO_PICurrent_Impl::Table &
 TAO_PICurrent_Impl::slot_table (void)
 {
-  return this->slot_table_;
+  return this->lc_slot_table_ == 0 ? this->slot_table_ : *this->lc_slot_table_;
 }
 
 ACE_INLINE void
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 65fa77af286..1bc7e2f2f61 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -97,7 +97,8 @@ TAO_NAMESPACE_DEFINE (const CORBA::Short, UNSUPPORTED_POLICY_VALUE, 4)
 TAO_NAMESPACE_END
 // Default constructor.
 CORBA::PolicyError::PolicyError (void)
-  : CORBA_UserException ("IDL:omg.org/CORBA/PolicyError:1.0")
+  : CORBA_UserException ("IDL:omg.org/CORBA/PolicyError:1.0",
+                         "PolicyError")
 {
 }
 
@@ -108,7 +109,10 @@ CORBA::PolicyError::~PolicyError (void)
 
 // Copy constructor.
 CORBA::PolicyError::PolicyError (const ::CORBA::PolicyError &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
   this->reason = _tao_excp.reason;
 }
@@ -131,7 +135,7 @@ void CORBA::PolicyError::_tao_any_destructor (void *_tao_void_pointer)
 CORBA::PolicyError *
 CORBA::PolicyError::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PolicyError:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PolicyError:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (PolicyError *, exc);
     }
@@ -194,7 +198,8 @@ void CORBA::PolicyError::_tao_decode (
 CORBA::PolicyError::PolicyError (
     CORBA::PolicyErrorCode _tao_reason
   )
-  : CORBA_UserException ("IDL:omg.org/CORBA/PolicyError:1.0")
+  : CORBA_UserException ("IDL:omg.org/CORBA/PolicyError:1.0",
+                         "PolicyError")
 {
   this->reason = _tao_reason;
 }
@@ -362,7 +367,10 @@ void CORBA::InvalidPolicies::_tao_seq_UShort::_tao_any_destructor (void *_tao_vo
 
 // Default constructor.
 CORBA::InvalidPolicies::InvalidPolicies (void)
-  : CORBA_UserException ("IDL:omg.org/CORBA/InvalidPolicies:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/CORBA/InvalidPolicies:1.0",
+        "InvalidPolicies"
+      )
 {
 }
 
@@ -373,7 +381,10 @@ CORBA::InvalidPolicies::~InvalidPolicies (void)
 
 // Copy constructor.
 CORBA::InvalidPolicies::InvalidPolicies (const ::CORBA::InvalidPolicies &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
   this->indices = _tao_excp.indices;
 }
@@ -396,7 +407,7 @@ void CORBA::InvalidPolicies::_tao_any_destructor (void *_tao_void_pointer)
 CORBA::InvalidPolicies *
 CORBA::InvalidPolicies::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/InvalidPolicies:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/InvalidPolicies:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (InvalidPolicies *, exc);
     }
@@ -459,7 +470,10 @@ void CORBA::InvalidPolicies::_tao_decode (
 CORBA::InvalidPolicies::InvalidPolicies (
     const CORBA::InvalidPolicies::_tao_seq_UShort & _tao_indices
   )
-  : CORBA_UserException ("IDL:omg.org/CORBA/InvalidPolicies:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/CORBA/InvalidPolicies:1.0",
+        "InvalidPolicies"
+      )
 {
   this->indices = _tao_indices;
 }
diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i
index d08fdf8d44f..5ee64975e3f 100644
--- a/TAO/tao/PolicyC.i
+++ b/TAO/tao/PolicyC.i
@@ -238,7 +238,7 @@ CORBA::Policy::Policy (
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::PolicyError &_tao_aggregate)
 {
   // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
+  if (strm << _tao_aggregate._rep_id ())
   {
     // now marshal the members (if any)
     if (
@@ -281,7 +281,7 @@ CORBA::Boolean TAO_Export operator>> (
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::InvalidPolicies &_tao_aggregate)
 {
   // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
+  if (strm << _tao_aggregate._rep_id ())
   {
     // now marshal the members (if any)
     if (
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index 7030688d7a5..c289b24a51d 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -958,7 +958,10 @@ const char* CORBA::PollableSet::_interface_repository_id (void) const
 
 // Default constructor.
 CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (void)
-  : CORBA_UserException ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0",
+        "NoPossiblePollable"
+      )
 {
 }
 
@@ -969,7 +972,10 @@ CORBA::PollableSet::NoPossiblePollable::~NoPossiblePollable (void)
 
 // Copy constructor.
 CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (const ::CORBA::PollableSet::NoPossiblePollable &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -984,7 +990,7 @@ CORBA::PollableSet::NoPossiblePollable::operator= (const ::CORBA::PollableSet::N
 CORBA::PollableSet::NoPossiblePollable *
 CORBA::PollableSet::NoPossiblePollable::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (NoPossiblePollable *, exc);
     }
@@ -1036,7 +1042,10 @@ void CORBA::PollableSet::NoPossiblePollable::_tao_decode (
 
 // Default constructor.
 CORBA::PollableSet::UnknownPollable::UnknownPollable (void)
-  : CORBA_UserException ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0",
+        "UnknownPollable"
+      )
 {
 }
 
@@ -1047,7 +1056,10 @@ CORBA::PollableSet::UnknownPollable::~UnknownPollable (void)
 
 // Copy constructor.
 CORBA::PollableSet::UnknownPollable::UnknownPollable (const ::CORBA::PollableSet::UnknownPollable &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -1062,7 +1074,7 @@ CORBA::PollableSet::UnknownPollable::operator= (const ::CORBA::PollableSet::Unkn
 CORBA::PollableSet::UnknownPollable *
 CORBA::PollableSet::UnknownPollable::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (UnknownPollable *, exc);
     }
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 8da105c782d..cb7649721d5 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -342,7 +342,10 @@ const char* PortableInterceptor::Interceptor::_interface_repository_id (void) co
 
 // Default constructor.
 PortableInterceptor::ForwardRequest::ForwardRequest (void)
-  : CORBA_UserException ("IDL:PortableInterceptor/ForwardRequest:1.0")
+  : CORBA_UserException (
+        "IDL:PortableInterceptor/ForwardRequest:1.0",
+        "ForwardRequest"
+      )
 {
 }
 
@@ -353,7 +356,10 @@ PortableInterceptor::ForwardRequest::~ForwardRequest (void)
 
 // Copy constructor.
 PortableInterceptor::ForwardRequest::ForwardRequest (const ::PortableInterceptor::ForwardRequest &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
   this->forward = CORBA::Object::_duplicate (_tao_excp.forward.in ());
   this->permanent = _tao_excp.permanent;
@@ -378,7 +384,7 @@ void PortableInterceptor::ForwardRequest::_tao_any_destructor (void *_tao_void_p
 PortableInterceptor::ForwardRequest *
 PortableInterceptor::ForwardRequest::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableInterceptor/ForwardRequest:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:PortableInterceptor/ForwardRequest:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (ForwardRequest *, exc);
     }
@@ -442,7 +448,10 @@ PortableInterceptor::ForwardRequest::ForwardRequest (
     const CORBA::Object_ptr  _tao_forward,
     CORBA::Boolean _tao_permanent
   )
-  : CORBA_UserException ("IDL:PortableInterceptor/ForwardRequest:1.0")
+  : CORBA_UserException (
+        "IDL:PortableInterceptor/ForwardRequest:1.0",
+        "ForwardRequest"
+      )
 {
   this->forward = CORBA::Object::_duplicate (_tao_forward);
   this->permanent = _tao_permanent;
@@ -610,7 +619,10 @@ TAO_NAMESPACE_END
 
 // Default constructor.
 PortableInterceptor::InvalidSlot::InvalidSlot (void)
-  : CORBA_UserException ("IDL:PortableInterceptor/InvalidSlot:1.0")
+  : CORBA_UserException (
+        "IDL:PortableInterceptor/InvalidSlot:1.0",
+        "InvalidSlot"
+      )
 {
 }
 
@@ -621,7 +633,10 @@ PortableInterceptor::InvalidSlot::~InvalidSlot (void)
 
 // Copy constructor.
 PortableInterceptor::InvalidSlot::InvalidSlot (const ::PortableInterceptor::InvalidSlot &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -642,7 +657,7 @@ void PortableInterceptor::InvalidSlot::_tao_any_destructor (void *_tao_void_poin
 PortableInterceptor::InvalidSlot *
 PortableInterceptor::InvalidSlot::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableInterceptor/InvalidSlot:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:PortableInterceptor/InvalidSlot:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (InvalidSlot *, exc);
     }
@@ -3827,7 +3842,10 @@ const char* PortableInterceptor::ORBInitInfo::_interface_repository_id (void) co
 
 // Default constructor.
 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (void)
-  : CORBA_UserException ("IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0")
+  : CORBA_UserException (
+        "IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
+        "DuplicateName"
+      )
 {
 }
 
@@ -3838,7 +3856,10 @@ PortableInterceptor::ORBInitInfo::DuplicateName::~DuplicateName (void)
 
 // Copy constructor.
 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
   this->name = CORBA::string_dup (_tao_excp.name.in ());
 }
@@ -3855,7 +3876,7 @@ PortableInterceptor::ORBInitInfo::DuplicateName::operator= (const ::PortableInte
 PortableInterceptor::ORBInitInfo::DuplicateName *
 PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (DuplicateName *, exc);
     }
@@ -3908,14 +3929,20 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode (
 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (
     const char * _tao_name
   )
-  : CORBA_UserException ("IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0")
+  : CORBA_UserException (
+        "IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
+        "DuplicateName"
+      )
 {
   this->name = CORBA::string_dup (_tao_name);
 }
 
 // Default constructor.
 PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (void)
-  : CORBA_UserException ("IDL:PortableInterceptor/ORBInitInfo/InvalidName:1.0")
+  : CORBA_UserException (
+        "IDL:PortableInterceptor/ORBInitInfo/InvalidName:1.0",
+        "InvalidName"
+      )
 {
 }
 
@@ -3926,7 +3953,10 @@ PortableInterceptor::ORBInitInfo::InvalidName::~InvalidName (void)
 
 // Copy constructor.
 PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -3941,7 +3971,7 @@ PortableInterceptor::ORBInitInfo::InvalidName::operator= (const ::PortableInterc
 PortableInterceptor::ORBInitInfo::InvalidName *
 PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableInterceptor/ORBInitInfo/InvalidName:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:PortableInterceptor/ORBInitInfo/InvalidName:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (InvalidName *, exc);
     }
diff --git a/TAO/tao/PortableInterceptorC.i b/TAO/tao/PortableInterceptorC.i
index f706c559e21..0874ea77d99 100644
--- a/TAO/tao/PortableInterceptorC.i
+++ b/TAO/tao/PortableInterceptorC.i
@@ -122,7 +122,7 @@
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableInterceptor::ForwardRequest &_tao_aggregate)
 {
   // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
+  if (strm << _tao_aggregate._rep_id ())
   {
     // now marshal the members (if any)
     if (
@@ -152,7 +152,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,PortableInterceptor::Fo
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableInterceptor::InvalidSlot &_tao_aggregate)
 {
   // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
+  if (strm << _tao_aggregate._rep_id ())
     return 1;
   else
     return 0;
diff --git a/TAO/tao/RTCORBA/Makefile b/TAO/tao/RTCORBA/Makefile
index 16d2c6a2347..6c08cbf75d7 100644
--- a/TAO/tao/RTCORBA/Makefile
+++ b/TAO/tao/RTCORBA/Makefile
@@ -86,16 +86,15 @@ endif # corba_messaging
 
 
 .obj/Continuous_Priority_Mapping.o .obj/Continuous_Priority_Mapping.so .shobj/Continuous_Priority_Mapping.o .shobj/Continuous_Priority_Mapping.so: Continuous_Priority_Mapping.cpp \
- Continuous_Priority_Mapping.h \
- $(ACE_ROOT)/ace/pre.h \
+ Continuous_Priority_Mapping.h $(ACE_ROOT)/ace/pre.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
  $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- rtcorba_export.h Priority_Mapping.h RTCORBAC.h \
+ $(ACE_ROOT)/ace/Basic_Types.i rtcorba_export.h \
+ Priority_Mapping.h RTCORBAC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -238,8 +237,8 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- RTCORBAC.i Priority_Mapping.i Continuous_Priority_Mapping.i \
+ $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+ Priority_Mapping.i Continuous_Priority_Mapping.i \
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/Sched_Params.i
 
@@ -253,8 +252,7 @@ endif # corba_messaging
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
  Direct_Priority_Mapping.h Priority_Mapping.h RTCORBAC.h \
- rtcorba_export.h \
- $(TAO_ROOT)/tao/IOPC.h \
+ rtcorba_export.h $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -396,8 +394,8 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- RTCORBAC.i Priority_Mapping.i Direct_Priority_Mapping.i \
+ $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+ Priority_Mapping.i Direct_Priority_Mapping.i \
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/Sched_Params.i
 
@@ -553,8 +551,8 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- RTCORBAC.i Priority_Mapping.i Linear_Priority_Mapping.i \
+ $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+ Priority_Mapping.i Linear_Priority_Mapping.i \
  $(TAO_ROOT)/tao/debug.h \
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/Sched_Params.i
@@ -764,9 +762,9 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -859,9 +857,8 @@ endif # corba_messaging
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
  $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- Priority_Mapping.h RTCORBAC.h rtcorba_export.h \
- $(TAO_ROOT)/tao/IOPC.h \
+ $(ACE_ROOT)/ace/Basic_Types.i Priority_Mapping.h \
+ RTCORBAC.h rtcorba_export.h $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -1003,20 +1000,19 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- RTCORBAC.i Priority_Mapping.i
+ $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+ Priority_Mapping.i
 
 .obj/Priority_Mapping_Manager.o .obj/Priority_Mapping_Manager.so .shobj/Priority_Mapping_Manager.o .shobj/Priority_Mapping_Manager.so: Priority_Mapping_Manager.cpp \
- Priority_Mapping_Manager.h \
- $(ACE_ROOT)/ace/pre.h \
+ Priority_Mapping_Manager.h $(ACE_ROOT)/ace/pre.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
  $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- rtcorba_export.h Priority_Mapping.h RTCORBAC.h \
+ $(ACE_ROOT)/ace/Basic_Types.i rtcorba_export.h \
+ Priority_Mapping.h RTCORBAC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -1159,23 +1155,20 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- RTCORBAC.i Priority_Mapping.i \
- $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+ Priority_Mapping.i $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  Priority_Mapping_Manager.i
 
 .obj/Private_Transport_Descriptor.o .obj/Private_Transport_Descriptor.so .shobj/Private_Transport_Descriptor.o .shobj/Private_Transport_Descriptor.so: Private_Transport_Descriptor.cpp \
- Private_Transport_Descriptor.h \
- $(ACE_ROOT)/ace/pre.h \
+ Private_Transport_Descriptor.h $(ACE_ROOT)/ace/pre.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
  $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- rtcorba_export.h \
+ $(ACE_ROOT)/ace/Basic_Types.i rtcorba_export.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -1269,8 +1262,7 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.i
 
-.obj/RTCORBA.o .obj/RTCORBA.so .shobj/RTCORBA.o .shobj/RTCORBA.so: RTCORBA.cpp RTCORBA.h \
- $(ACE_ROOT)/ace/pre.h rtcorba_export.h \
+.obj/RTCORBA.o .obj/RTCORBA.so .shobj/RTCORBA.o .shobj/RTCORBA.so: RTCORBA.cpp RTCORBA.h $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -1364,8 +1356,8 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- RTCORBAC.h $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/corbafwd.i RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
@@ -1420,9 +1412,8 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- RTCORBAC.i RT_ORB_Loader.h \
- $(ACE_ROOT)/ace/Service_Object.h \
+ $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+ RT_ORB_Loader.h $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
@@ -1540,8 +1531,8 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- RTCORBAC.h $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/corbafwd.i RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/String_Base.h \
@@ -1596,8 +1587,8 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- RTCORBAC.i $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+ $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -1705,8 +1696,6 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/LF_Event.inl \
  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
  $(TAO_ROOT)/tao/Service_Context.h \
  $(TAO_ROOT)/tao/Service_Context.inl \
@@ -1731,9 +1720,8 @@ endif # corba_messaging
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
  $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- RTCORBAC.h rtcorba_export.h \
- $(TAO_ROOT)/tao/IOPC.h \
+ $(ACE_ROOT)/ace/Basic_Types.i RTCORBAC.h \
+ rtcorba_export.h $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -1875,11 +1863,9 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- RTCORBAC.i \
+ $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
  $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- RT_Current.i \
+ $(TAO_ROOT)/tao/LocalObject.i RT_Current.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
@@ -1977,12 +1963,11 @@ endif # corba_messaging
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- Priority_Mapping.h Priority_Mapping.i
+ $(TAO_ROOT)/tao/Stub.i Priority_Mapping.h \
+ Priority_Mapping.i
 
 .obj/RT_Endpoint_Selector_Factory.o .obj/RT_Endpoint_Selector_Factory.so .shobj/RT_Endpoint_Selector_Factory.o .shobj/RT_Endpoint_Selector_Factory.so: RT_Endpoint_Selector_Factory.cpp \
- RT_Endpoint_Selector_Factory.h \
- $(ACE_ROOT)/ace/pre.h rtcorba_export.h \
+ RT_Endpoint_Selector_Factory.h $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -2146,30 +2131,8 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/LF_Event.inl \
  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/operation_details.h \
  $(TAO_ROOT)/tao/Service_Context.h \
  $(TAO_ROOT)/tao/Service_Context.inl \
@@ -2178,10 +2141,16 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation.i \
- RT_Endpoint_Utils.h RT_Stub.h \
- $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Invocation.i RT_Endpoint_Utils.h \
+ RT_Stub.h $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
@@ -2200,6 +2169,16 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(TAO_ROOT)/tao/Adapter.h \
  $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -2214,8 +2193,6 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -2425,30 +2402,8 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/LF_Event.inl \
  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/operation_details.h \
  $(TAO_ROOT)/tao/Service_Context.h \
  $(TAO_ROOT)/tao/Service_Context.inl \
@@ -2457,9 +2412,16 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation.i \
- RT_Stub.h $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Invocation.i RT_Stub.h \
+ $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
@@ -2478,6 +2440,16 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(TAO_ROOT)/tao/Adapter.h \
  $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -2492,8 +2464,6 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -2634,8 +2604,7 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- rtcorba_export.h \
+ $(TAO_ROOT)/tao/corbafwd.i rtcorba_export.h \
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
  RT_Invocation_Endpoint_Selectors.i \
@@ -2681,15 +2650,18 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/LF_Event.inl \
  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation.i RT_Policy_i.h \
+ RTCORBAC.h $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
  $(TAO_ROOT)/tao/TAO_Singleton.h \
@@ -2704,20 +2676,15 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
  $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation.i \
- RT_Policy_i.h RTCORBAC.h RTCORBAC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
  $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- RT_Policy_i.i \
+ $(TAO_ROOT)/tao/LocalObject.i RT_Policy_i.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
@@ -2757,8 +2724,6 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -2823,8 +2788,8 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- RT_Stub.h Private_Transport_Descriptor.h \
+ $(TAO_ROOT)/tao/Endpoint.i RT_Stub.h \
+ Private_Transport_Descriptor.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
  Private_Transport_Descriptor.inl \
@@ -2842,9 +2807,8 @@ endif # corba_messaging
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
  $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- RTCORBAC.h rtcorba_export.h \
- $(TAO_ROOT)/tao/IOPC.h \
+ $(ACE_ROOT)/ace/Basic_Types.i RTCORBAC.h \
+ rtcorba_export.h $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -2986,11 +2950,9 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- RTCORBAC.i \
+ $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
  $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- RT_ORB.h \
+ $(TAO_ROOT)/tao/LocalObject.i RT_ORB.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -3020,20 +2982,17 @@ endif # corba_messaging
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- RT_ORB.i
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h RT_ORB.i
 
-.obj/RT_ORB.o .obj/RT_ORB.so .shobj/RT_ORB.o .shobj/RT_ORB.so: RT_ORB.cpp RT_ORB.h \
- $(ACE_ROOT)/ace/pre.h \
+.obj/RT_ORB.o .obj/RT_ORB.so .shobj/RT_ORB.o .shobj/RT_ORB.so: RT_ORB.cpp RT_ORB.h $(ACE_ROOT)/ace/pre.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
  $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- RTCORBAC.h rtcorba_export.h \
- $(TAO_ROOT)/tao/IOPC.h \
+ $(ACE_ROOT)/ace/Basic_Types.i RTCORBAC.h \
+ rtcorba_export.h $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -3175,8 +3134,7 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- RTCORBAC.i \
+ $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
@@ -3208,10 +3166,9 @@ endif # corba_messaging
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- RT_ORB.i RT_Policy_i.h RT_Policy_i.i RT_Mutex.h \
- Priority_Mapping_Manager.h Priority_Mapping.h Priority_Mapping.i \
- Priority_Mapping_Manager.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h RT_ORB.i \
+ RT_Policy_i.h RT_Policy_i.i RT_Mutex.h Priority_Mapping_Manager.h \
+ Priority_Mapping.h Priority_Mapping.i Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
@@ -3401,8 +3358,7 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- rtcorba_export.h \
+ $(TAO_ROOT)/tao/corbafwd.i rtcorba_export.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
@@ -3449,9 +3405,9 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
@@ -3459,8 +3415,7 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- RT_PolicyFactory.h \
+ $(TAO_ROOT)/tao/LocalObject.i RT_PolicyFactory.h \
  RTCORBAC.h \
  rtcorba_export.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -3478,8 +3433,8 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
  $(TAO_ROOT)/tao/TimeBaseC.i \
- RTCORBAC.i \
- RT_Policy_i.h RTCORBAC.h RT_Policy_i.i RT_Protocols_Hooks.h \
+ RTCORBAC.i RT_Policy_i.h \
+ RTCORBAC.h RT_Policy_i.i RT_Protocols_Hooks.h \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -3504,8 +3459,7 @@ endif # corba_messaging
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- RT_Protocols_Hooks.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h RT_Protocols_Hooks.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
@@ -3564,9 +3518,8 @@ endif # corba_messaging
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/ORBInitInfo.h \
- $(TAO_ROOT)/tao/ORBInitInfo.inl \
- RT_ORB_Loader.h RT_Stub_Factory.h \
- $(TAO_ROOT)/tao/Stub_Factory.h \
+ $(TAO_ROOT)/tao/ORBInitInfo.inl RT_ORB_Loader.h \
+ RT_Stub_Factory.h $(TAO_ROOT)/tao/Stub_Factory.h \
  RT_Endpoint_Selector_Factory.h \
  $(TAO_ROOT)/tao/Endpoint_Selector_Factory.h \
  Continuous_Priority_Mapping.h Continuous_Priority_Mapping.i \
@@ -3704,8 +3657,7 @@ endif # corba_messaging
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- RT_ORBInitializer.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h RT_ORBInitializer.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -3756,9 +3708,9 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
@@ -3766,8 +3718,7 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- RT_PolicyFactory.h \
+ $(TAO_ROOT)/tao/LocalObject.i RT_PolicyFactory.h \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/ORB.h \
@@ -3836,8 +3787,7 @@ endif # corba_messaging
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/ORBInitializer_Registry.h \
- $(TAO_ROOT)/tao/ORBInitializer_Registry.inl
+ $(TAO_ROOT)/tao/ORBInitializer_Registry.h
 
 .obj/RT_PolicyFactory.o .obj/RT_PolicyFactory.so .shobj/RT_PolicyFactory.o .shobj/RT_PolicyFactory.so: RT_PolicyFactory.cpp RT_PolicyFactory.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -3934,8 +3884,7 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- rtcorba_export.h \
+ $(TAO_ROOT)/tao/corbafwd.i rtcorba_export.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
@@ -3982,9 +3931,9 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
@@ -3992,9 +3941,8 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- RT_Policy_i.h RTCORBAC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/LocalObject.i RT_Policy_i.h \
+ RTCORBAC.h $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
  $(TAO_ROOT)/tao/TAO_Singleton.h \
@@ -4008,8 +3956,8 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- RTCORBAC.i RT_Policy_i.i
+ $(TAO_ROOT)/tao/TimeBaseC.i RTCORBAC.i \
+ RT_Policy_i.i
 
 .obj/RT_Policy_i.o .obj/RT_Policy_i.so .shobj/RT_Policy_i.o .shobj/RT_Policy_i.so: RT_Policy_i.cpp RT_Policy_i.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -4019,9 +3967,8 @@ endif # corba_messaging
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
  $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- RTCORBAC.h rtcorba_export.h \
- $(TAO_ROOT)/tao/IOPC.h \
+ $(ACE_ROOT)/ace/Basic_Types.i RTCORBAC.h \
+ rtcorba_export.h $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -4163,11 +4110,9 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- RTCORBAC.i \
+ $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
  $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- RT_Policy_i.i \
+ $(TAO_ROOT)/tao/LocalObject.i RT_Policy_i.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
@@ -4420,9 +4365,8 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- RTCORBAC.i Priority_Mapping.i \
- $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+ Priority_Mapping.i $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  Priority_Mapping_Manager.i \
  $(ACE_ROOT)/ace/Service_Config.h \
@@ -4442,8 +4386,8 @@ endif # corba_messaging
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- RT_Protocols_Hooks.i RT_Policy_i.h RT_Policy_i.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h RT_Protocols_Hooks.i \
+ RT_Policy_i.h RT_Policy_i.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
@@ -4452,8 +4396,8 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/LF_Event.inl \
  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/operation_details.h \
  $(TAO_ROOT)/tao/Service_Context.h \
  $(TAO_ROOT)/tao/Service_Context.inl \
@@ -4495,8 +4439,6 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -4544,15 +4486,13 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/Transport_Acceptor.h \
- $(TAO_ROOT)/tao/Transport_Acceptor.inl \
- RT_Stub.h \
+ $(TAO_ROOT)/tao/Transport_Acceptor.inl RT_Stub.h \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
  $(ACE_ROOT)/ace/Dynamic_Service.i \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/RT_Stub.o .obj/RT_Stub.so .shobj/RT_Stub.o .shobj/RT_Stub.so: RT_Stub.cpp RT_Stub.h \
- $(ACE_ROOT)/ace/pre.h \
+.obj/RT_Stub.o .obj/RT_Stub.so .shobj/RT_Stub.o .shobj/RT_Stub.so: RT_Stub.cpp RT_Stub.h $(ACE_ROOT)/ace/pre.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -4738,9 +4678,9 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -4797,14 +4737,14 @@ endif # corba_messaging
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- rtcorba_export.h RT_Policy_i.h RTCORBAC.h \
+ $(TAO_ROOT)/tao/Stub.i rtcorba_export.h \
+ RT_Policy_i.h RTCORBAC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- RTCORBAC.i RT_Policy_i.i
+ $(TAO_ROOT)/tao/TimeBaseC.i RTCORBAC.i \
+ RT_Policy_i.i
 
 .obj/RT_Stub_Factory.o .obj/RT_Stub_Factory.so .shobj/RT_Stub_Factory.o .shobj/RT_Stub_Factory.so: RT_Stub_Factory.cpp RT_Stub_Factory.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -4901,8 +4841,7 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- rtcorba_export.h \
+ $(TAO_ROOT)/tao/corbafwd.i rtcorba_export.h \
  $(TAO_ROOT)/tao/Stub_Factory.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -4934,8 +4873,8 @@ endif # corba_messaging
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- RT_Stub.h $(TAO_ROOT)/tao/Stub.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h RT_Stub.h \
+ $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
@@ -5010,9 +4949,9 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -5064,9 +5003,8 @@ endif # corba_messaging
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
  $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- RTCORBAC.h rtcorba_export.h \
- $(TAO_ROOT)/tao/IOPC.h \
+ $(ACE_ROOT)/ace/Basic_Types.i RTCORBAC.h \
+ rtcorba_export.h $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -5208,8 +5146,7 @@ endif # corba_messaging
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- RTCORBAC.i \
+ $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -5274,8 +5211,7 @@ endif # corba_messaging
  $(ACE_ROOT)/ace/Module.i \
  $(ACE_ROOT)/ace/Module.cpp \
  $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- Thread_Pool.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp Thread_Pool.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index 93b4e372dcf..2f77f34854c 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -98,7 +98,6 @@ TAO_DIOP_Connector::close (void)
 int
 TAO_DIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
 {
-
   TAO_DIOP_Endpoint *diop_endpoint =
     this->remote_endpoint (endpoint);
 
diff --git a/TAO/tao/Strategies/Makefile b/TAO/tao/Strategies/Makefile
index 75b7eaaf2a2..658515f9320 100644
--- a/TAO/tao/Strategies/Makefile
+++ b/TAO/tao/Strategies/Makefile
@@ -210,8 +210,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- strategies_export.h DIOP_Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h strategies_export.h \
+ DIOP_Acceptor.h \
  $(TAO_ROOT)/tao/Transport_Acceptor.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/Exception.h \
@@ -239,8 +239,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
- DIOP_Connection_Handler.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ DIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Svc_Handler.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
@@ -311,13 +310,16 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SOCK.i \
- $(TAO_ROOT)/tao/Transport.h \
+ $(TAO_ROOT)/tao/Connection_Handler.inl \
+ DIOP_Transport.h $(TAO_ROOT)/tao/Transport.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
@@ -330,18 +332,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
  $(TAO_ROOT)/tao/Transport.inl \
- $(TAO_ROOT)/tao/Connection_Handler.inl \
- DIOP_Transport.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK_IO.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- DIOP_Transport.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i DIOP_Transport.i \
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- DIOP_Connection_Handler.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i DIOP_Connection_Handler.i \
  $(TAO_ROOT)/tao/Acceptor_Impl.h \
  $(TAO_ROOT)/tao/Acceptor_Impl.i \
  $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
@@ -570,8 +568,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- DIOP_Endpoint.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i DIOP_Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -583,8 +580,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- strategies_export.h DIOP_Endpoint.i DIOP_Profile.i \
+ $(ACE_ROOT)/ace/INET_Addr.i strategies_export.h \
+ DIOP_Endpoint.i DIOP_Profile.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/Policy_Set.h \
@@ -919,8 +916,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
  $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- strategies_export.h DIOP_Transport.i DIOP_Connection_Handler.h \
+ $(ACE_ROOT)/ace/Dynamic.i strategies_export.h \
+ DIOP_Transport.i DIOP_Connection_Handler.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -937,10 +934,12 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(TAO_ROOT)/tao/Connection_Handler.inl \
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- DIOP_Connection_Handler.i DIOP_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i DIOP_Connection_Handler.i \
+ DIOP_Acceptor.h \
  $(TAO_ROOT)/tao/Transport_Acceptor.h \
  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
  $(TAO_ROOT)/tao/Acceptor_Impl.h \
@@ -1029,8 +1028,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- DIOP_Endpoint.h DIOP_Endpoint.i DIOP_Profile.i \
+ $(TAO_ROOT)/tao/Object_KeyC.i DIOP_Endpoint.h \
+ DIOP_Endpoint.i DIOP_Profile.i \
  $(TAO_ROOT)/tao/Acceptor_Registry.h \
  $(TAO_ROOT)/tao/Acceptor_Registry.i \
  $(TAO_ROOT)/tao/operation_details.h \
@@ -1176,8 +1175,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Transport_Connector.h \
  $(TAO_ROOT)/tao/Transport_Connector.inl \
- DIOP_Connection_Handler.h \
- $(ACE_ROOT)/ace/Reactor.h \
+ DIOP_Connection_Handler.h $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
  $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
@@ -1279,13 +1277,16 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SOCK.i \
- $(TAO_ROOT)/tao/Transport.h \
+ $(TAO_ROOT)/tao/Connection_Handler.inl \
+ DIOP_Transport.h $(TAO_ROOT)/tao/Transport.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
@@ -1323,18 +1324,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
  $(TAO_ROOT)/tao/Transport.inl \
- $(TAO_ROOT)/tao/Connection_Handler.inl \
- DIOP_Transport.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK_IO.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- strategies_export.h DIOP_Transport.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- DIOP_Connection_Handler.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i strategies_export.h \
+ DIOP_Transport.i $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i DIOP_Connection_Handler.i \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -1409,17 +1406,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/LF_Event.h \
- $(TAO_ROOT)/tao/LF_Event.inl \
  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
  $(TAO_ROOT)/tao/Service_Context.h \
  $(TAO_ROOT)/tao/Service_Context.inl \
@@ -1428,15 +1416,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation.i \
- DIOP_Profile.h \
+ $(TAO_ROOT)/tao/Invocation.i DIOP_Profile.h \
  $(TAO_ROOT)/tao/Profile.h \
  $(TAO_ROOT)/tao/Tagged_Components.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/Profile.i \
- DIOP_Endpoint.h DIOP_Endpoint.i DIOP_Profile.i
+ $(TAO_ROOT)/tao/Profile.i DIOP_Endpoint.h \
+ DIOP_Endpoint.i DIOP_Profile.i
 
 .obj/DIOP_Acceptor.o .obj/DIOP_Acceptor.so .shobj/DIOP_Acceptor.o .shobj/DIOP_Acceptor.so: DIOP_Acceptor.cpp DIOP_Acceptor.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -1570,8 +1557,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
- DIOP_Connection_Handler.h \
- $(ACE_ROOT)/ace/Reactor.h \
+ DIOP_Connection_Handler.h $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
  $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
@@ -1664,13 +1650,16 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SOCK.i \
- $(TAO_ROOT)/tao/Transport.h \
+ $(TAO_ROOT)/tao/Connection_Handler.inl \
+ DIOP_Transport.h $(TAO_ROOT)/tao/Transport.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
@@ -1683,18 +1672,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
  $(TAO_ROOT)/tao/Transport.inl \
- $(TAO_ROOT)/tao/Connection_Handler.inl \
- DIOP_Transport.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK_IO.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- strategies_export.h DIOP_Transport.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- DIOP_Connection_Handler.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i strategies_export.h \
+ DIOP_Transport.i $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i DIOP_Connection_Handler.i \
  $(TAO_ROOT)/tao/Acceptor_Impl.h \
  $(TAO_ROOT)/tao/Acceptor_Impl.i \
  $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
@@ -1781,14 +1766,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- DIOP_Endpoint.h DIOP_Endpoint.i DIOP_Profile.i \
+ $(TAO_ROOT)/tao/Object_KeyC.i DIOP_Endpoint.h \
+ DIOP_Endpoint.i DIOP_Profile.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i
 
 .obj/DIOP_Connection_Handler.o .obj/DIOP_Connection_Handler.so .shobj/DIOP_Connection_Handler.o .shobj/DIOP_Connection_Handler.so: DIOP_Connection_Handler.cpp \
- DIOP_Connection_Handler.h \
- $(ACE_ROOT)/ace/pre.h \
+ DIOP_Connection_Handler.h $(ACE_ROOT)/ace/pre.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -1985,13 +1969,16 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SOCK.i \
- $(TAO_ROOT)/tao/Transport.h \
+ $(TAO_ROOT)/tao/Connection_Handler.inl \
+ DIOP_Transport.h $(TAO_ROOT)/tao/Transport.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
@@ -2029,18 +2016,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
  $(TAO_ROOT)/tao/Transport.inl \
- $(TAO_ROOT)/tao/Connection_Handler.inl \
- DIOP_Transport.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK_IO.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- strategies_export.h DIOP_Transport.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- DIOP_Connection_Handler.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i strategies_export.h \
+ DIOP_Transport.i $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i DIOP_Connection_Handler.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/tao/debug.h \
@@ -2115,8 +2098,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Endpoint.i \
  $(TAO_ROOT)/tao/Base_Transport_Property.inl \
  $(TAO_ROOT)/tao/Resume_Handle.h \
- $(TAO_ROOT)/tao/Resume_Handle.inl \
- DIOP_Endpoint.h DIOP_Endpoint.i
+ $(TAO_ROOT)/tao/Resume_Handle.inl DIOP_Endpoint.h \
+ DIOP_Endpoint.i
 
 .obj/DIOP_Endpoint.o .obj/DIOP_Endpoint.so .shobj/DIOP_Endpoint.o .shobj/DIOP_Endpoint.so: DIOP_Endpoint.cpp DIOP_Endpoint.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -2260,8 +2243,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- strategies_export.h DIOP_Endpoint.i DIOP_Connection_Handler.h \
+ $(ACE_ROOT)/ace/INET_Addr.i strategies_export.h \
+ DIOP_Endpoint.i DIOP_Connection_Handler.h \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
  $(ACE_ROOT)/ace/Handle_Set.i \
@@ -2355,11 +2338,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SOCK.i \
- $(TAO_ROOT)/tao/Transport.h \
+ $(TAO_ROOT)/tao/Connection_Handler.inl \
+ DIOP_Transport.h $(TAO_ROOT)/tao/Transport.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
@@ -2378,16 +2364,12 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
  $(TAO_ROOT)/tao/Transport.inl \
- $(TAO_ROOT)/tao/Connection_Handler.inl \
- DIOP_Transport.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- DIOP_Transport.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i DIOP_Transport.i \
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- DIOP_Connection_Handler.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i DIOP_Connection_Handler.i \
  $(TAO_ROOT)/tao/debug.h
 
 .obj/UIOP_Factory.o .obj/UIOP_Factory.so .shobj/UIOP_Factory.o .shobj/UIOP_Factory.so: UIOP_Factory.cpp UIOP_Factory.h \
@@ -2499,8 +2481,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(ACE_ROOT)/ace/SString.i \
- strategies_export.h \
+ $(ACE_ROOT)/ace/SString.i strategies_export.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
@@ -2518,8 +2499,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- UIOP_Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h UIOP_Acceptor.h \
  $(TAO_ROOT)/tao/Transport_Acceptor.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/Exception.h \
@@ -2649,9 +2629,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
- $(TAO_ROOT)/tao/Transport.inl \
- UIOP_Transport.i \
+ $(TAO_ROOT)/tao/Transport.inl UIOP_Transport.i \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(TAO_ROOT)/tao/Connection_Handler.inl \
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
@@ -2748,8 +2729,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Connector_Impl.cpp
 
 .obj/UIOP_Lite_Factory.o .obj/UIOP_Lite_Factory.so .shobj/UIOP_Lite_Factory.o .shobj/UIOP_Lite_Factory.so: UIOP_Lite_Factory.cpp UIOP_Lite_Factory.h \
- $(ACE_ROOT)/ace/pre.h \
- strategies_export.h \
+ $(ACE_ROOT)/ace/pre.h strategies_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -2875,8 +2855,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- UIOP_Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h UIOP_Acceptor.h \
  $(TAO_ROOT)/tao/Transport_Acceptor.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/Exception.h \
@@ -3006,9 +2985,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
- $(TAO_ROOT)/tao/Transport.inl \
- UIOP_Transport.i \
+ $(TAO_ROOT)/tao/Transport.inl UIOP_Transport.i \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(TAO_ROOT)/tao/Connection_Handler.inl \
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
@@ -3252,8 +3232,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
- $(TAO_ROOT)/tao/Profile.i \
- strategies_export.h \
+ $(TAO_ROOT)/tao/Profile.i strategies_export.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  UIOP_Connection_Handler.h UIOP_Transport.h \
@@ -3367,8 +3346,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
  $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- UIOP_Transport.i \
+ $(ACE_ROOT)/ace/Dynamic.i UIOP_Transport.i \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -3383,14 +3361,15 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/WFMO_Reactor.h \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(TAO_ROOT)/tao/Connection_Handler.inl \
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
  UIOP_Connection_Handler.inl UIOP_Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- UIOP_Endpoint.i UIOP_Profile.i \
- $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Endpoint.i UIOP_Endpoint.i \
+ UIOP_Profile.i $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/CORBA_String.h \
@@ -3446,8 +3425,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PICurrent.h \
  $(TAO_ROOT)/tao/PICurrent.inl \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- uiop_endpoints.h uiop_endpoints.i
+ $(TAO_ROOT)/tao/ORB_Core.i uiop_endpoints.h \
+ uiop_endpoints.i
 
 .obj/UIOP_Transport.o .obj/UIOP_Transport.so .shobj/UIOP_Transport.o .shobj/UIOP_Transport.so: UIOP_Transport.cpp UIOP_Transport.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -3625,8 +3604,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
- $(TAO_ROOT)/tao/Transport.inl \
- strategies_export.h \
+ $(TAO_ROOT)/tao/Transport.inl strategies_export.h \
  $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
@@ -3690,9 +3668,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
  $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- UIOP_Transport.i UIOP_Connection_Handler.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Dynamic.i UIOP_Transport.i \
+ UIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Hashable.h \
@@ -3706,6 +3683,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/WFMO_Reactor.h \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(TAO_ROOT)/tao/Connection_Handler.inl \
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
@@ -3726,12 +3705,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- UIOP_Endpoint.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i UIOP_Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- UIOP_Endpoint.i UIOP_Profile.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
+ $(TAO_ROOT)/tao/Endpoint.i UIOP_Endpoint.i \
+ UIOP_Profile.i $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
  $(TAO_ROOT)/tao/Sync_Strategies.h \
@@ -4085,15 +4062,15 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
- $(TAO_ROOT)/tao/Transport.inl \
- strategies_export.h \
+ $(TAO_ROOT)/tao/Transport.inl strategies_export.h \
  $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- UIOP_Transport.i \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i UIOP_Transport.i \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(TAO_ROOT)/tao/Connection_Handler.inl \
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
@@ -4101,8 +4078,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Connector_Impl.h \
  $(TAO_ROOT)/tao/Connector_Impl.inl \
- $(TAO_ROOT)/tao/Connector_Impl.cpp \
- UIOP_Profile.h \
+ $(TAO_ROOT)/tao/Connector_Impl.cpp UIOP_Profile.h \
  $(TAO_ROOT)/tao/Profile.h \
  $(TAO_ROOT)/tao/Tagged_Components.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
@@ -4119,12 +4095,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- UIOP_Endpoint.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i UIOP_Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- UIOP_Endpoint.i UIOP_Profile.i \
- $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Endpoint.i UIOP_Endpoint.i \
+ UIOP_Profile.i $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
@@ -4183,15 +4157,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/LF_Event.h \
- $(TAO_ROOT)/tao/LF_Event.inl \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
  $(TAO_ROOT)/tao/Service_Context.h \
  $(TAO_ROOT)/tao/Service_Context.inl \
@@ -4200,7 +4165,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
- $(TAO_ROOT)/tao/Thread_Lane_Resources.i
+ $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
+ $(TAO_ROOT)/tao/Connect_Strategy.h
 
 .obj/UIOP_Acceptor.o .obj/UIOP_Acceptor.so .shobj/UIOP_Acceptor.o .shobj/UIOP_Acceptor.so: UIOP_Acceptor.cpp UIOP_Acceptor.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -4458,9 +4424,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
- $(TAO_ROOT)/tao/Transport.inl \
- strategies_export.h UIOP_Transport.i \
+ $(TAO_ROOT)/tao/Transport.inl strategies_export.h \
+ UIOP_Transport.i \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(TAO_ROOT)/tao/Connection_Handler.inl \
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
@@ -4543,23 +4511,21 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
- UIOP_Profile.h \
- $(TAO_ROOT)/tao/Profile.h \
+ UIOP_Profile.h $(TAO_ROOT)/tao/Profile.h \
  $(TAO_ROOT)/tao/Tagged_Components.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- UIOP_Endpoint.h UIOP_Endpoint.i UIOP_Profile.i \
+ $(TAO_ROOT)/tao/Object_KeyC.i UIOP_Endpoint.h \
+ UIOP_Endpoint.i UIOP_Profile.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i
 
 .obj/UIOP_Connection_Handler.o .obj/UIOP_Connection_Handler.so .shobj/UIOP_Connection_Handler.o .shobj/UIOP_Connection_Handler.so: UIOP_Connection_Handler.cpp \
- UIOP_Connection_Handler.h \
- $(ACE_ROOT)/ace/pre.h UIOP_Transport.h \
- $(TAO_ROOT)/tao/Transport.h \
+ UIOP_Connection_Handler.h $(ACE_ROOT)/ace/pre.h \
+ UIOP_Transport.h $(TAO_ROOT)/tao/Transport.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -4733,8 +4699,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
- $(TAO_ROOT)/tao/Transport.inl \
- strategies_export.h \
+ $(TAO_ROOT)/tao/Transport.inl strategies_export.h \
  $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
@@ -4798,8 +4763,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
  $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- UIOP_Transport.i \
+ $(ACE_ROOT)/ace/Dynamic.i UIOP_Transport.i \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -4814,13 +4778,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/WFMO_Reactor.h \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(TAO_ROOT)/tao/Connection_Handler.inl \
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
  UIOP_Connection_Handler.inl UIOP_Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- UIOP_Endpoint.i \
+ $(TAO_ROOT)/tao/Endpoint.i UIOP_Endpoint.i \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/ORB.h \
@@ -5002,13 +4967,12 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Endpoint.i \
- strategies_export.h \
+ $(TAO_ROOT)/tao/Endpoint.i strategies_export.h \
  $(ACE_ROOT)/ace/UNIX_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/UNIX_Addr.i \
- UIOP_Endpoint.i UIOP_Connection_Handler.h UIOP_Transport.h \
+ $(ACE_ROOT)/ace/UNIX_Addr.i UIOP_Endpoint.i \
+ UIOP_Connection_Handler.h UIOP_Transport.h \
  $(TAO_ROOT)/tao/Transport.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(ACE_ROOT)/ace/SString.h \
@@ -5149,8 +5113,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
  $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- UIOP_Transport.i \
+ $(ACE_ROOT)/ace/Dynamic.i UIOP_Transport.i \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -5165,6 +5128,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/WFMO_Reactor.h \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(TAO_ROOT)/tao/Connection_Handler.inl \
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
@@ -5279,8 +5244,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(ACE_ROOT)/ace/SString.i \
- strategies_export.h \
+ $(ACE_ROOT)/ace/SString.i strategies_export.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
@@ -5298,8 +5262,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- SHMIOP_Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h SHMIOP_Acceptor.h \
  $(TAO_ROOT)/tao/Transport_Acceptor.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/Exception.h \
@@ -5327,8 +5290,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
- SHMIOP_Connection_Handler.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Svc_Handler.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
@@ -5399,28 +5361,16 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SOCK.i \
- $(TAO_ROOT)/tao/Transport.h \
- $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Transport_Timer.h \
- $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
- $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
- $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
- $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
- $(TAO_ROOT)/tao/Transport.inl \
  $(TAO_ROOT)/tao/Connection_Handler.inl \
- SHMIOP_Transport.h \
- $(ACE_ROOT)/ace/MEM_Stream.h \
+ SHMIOP_Transport.h $(ACE_ROOT)/ace/MEM_Stream.h \
  $(ACE_ROOT)/ace/MEM_IO.h \
  $(ACE_ROOT)/ace/MEM_SAP.h \
  $(ACE_ROOT)/ace/PI_Malloc.h \
@@ -5438,7 +5388,20 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/MEM_Stream.i \
- SHMIOP_Transport.i SHMIOP_Connection_Handler.inl \
+ $(TAO_ROOT)/tao/Transport.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Transport_Timer.h \
+ $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+ $(TAO_ROOT)/tao/Transport.inl SHMIOP_Transport.i \
+ SHMIOP_Connection_Handler.inl \
  $(TAO_ROOT)/tao/Acceptor_Impl.h \
  $(TAO_ROOT)/tao/Acceptor_Impl.i \
  $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
@@ -5639,8 +5602,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- strategies_export.h \
+ $(TAO_ROOT)/tao/corbafwd.i strategies_export.h \
  $(TAO_ROOT)/tao/Profile.h \
  $(TAO_ROOT)/tao/Tagged_Components.h \
  $(TAO_ROOT)/tao/IOPC.h \
@@ -5691,8 +5653,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- SHMIOP_Endpoint.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i SHMIOP_Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -5706,9 +5667,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/MEM_Addr.h \
- $(ACE_ROOT)/ace/MEM_Addr.i \
- SHMIOP_Endpoint.i SHMIOP_Profile.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
+ $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i \
+ SHMIOP_Profile.i $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/Policy_Set.h \
  $(TAO_ROOT)/tao/Policy_Set.i \
@@ -5906,8 +5866,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- strategies_export.h \
+ $(TAO_ROOT)/tao/corbafwd.i strategies_export.h \
  $(ACE_ROOT)/ace/Svc_Handler.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
@@ -6055,9 +6014,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
- $(TAO_ROOT)/tao/Transport.inl \
- SHMIOP_Transport.i SHMIOP_Connection_Handler.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/Transport.inl SHMIOP_Transport.i \
+ SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Hashable.h \
@@ -6073,6 +6031,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(TAO_ROOT)/tao/Connection_Handler.inl \
  SHMIOP_Connection_Handler.inl SHMIOP_Profile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -6091,8 +6051,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- SHMIOP_Endpoint.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i SHMIOP_Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -6102,9 +6061,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/ORB.i \
  $(ACE_ROOT)/ace/MEM_Addr.h \
- $(ACE_ROOT)/ace/MEM_Addr.i \
- SHMIOP_Endpoint.i SHMIOP_Profile.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i \
+ SHMIOP_Profile.i $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
  $(TAO_ROOT)/tao/Sync_Strategies.h \
@@ -6428,12 +6386,15 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Connector.cpp \
  $(TAO_ROOT)/tao/Transport_Connector.h \
  $(TAO_ROOT)/tao/Transport_Connector.inl \
- SHMIOP_Connection_Handler.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
+ $(TAO_ROOT)/tao/Connection_Handler.inl \
+ SHMIOP_Transport.h strategies_export.h \
  $(TAO_ROOT)/tao/Transport.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
@@ -6471,16 +6432,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
- $(TAO_ROOT)/tao/Transport.inl \
- $(TAO_ROOT)/tao/Connection_Handler.inl \
- SHMIOP_Transport.h strategies_export.h SHMIOP_Transport.i \
+ $(TAO_ROOT)/tao/Transport.inl SHMIOP_Transport.i \
  SHMIOP_Connection_Handler.inl \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Connector_Impl.h \
  $(TAO_ROOT)/tao/Connector_Impl.inl \
  $(TAO_ROOT)/tao/Connector_Impl.cpp \
- SHMIOP_Profile.h \
- $(TAO_ROOT)/tao/Profile.h \
+ SHMIOP_Profile.h $(TAO_ROOT)/tao/Profile.h \
  $(TAO_ROOT)/tao/Tagged_Components.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
@@ -6496,8 +6454,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- SHMIOP_Endpoint.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i SHMIOP_Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -6505,9 +6462,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/CORBA_String.h \
  $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/ORB.i \
- SHMIOP_Endpoint.i SHMIOP_Profile.i \
- $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/ORB.i SHMIOP_Endpoint.i \
+ SHMIOP_Profile.i $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Base_Transport_Property.h \
  $(TAO_ROOT)/tao/Base_Transport_Property.inl \
  $(TAO_ROOT)/tao/ORB_Core.h \
@@ -6561,15 +6517,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/LF_Event.h \
- $(TAO_ROOT)/tao/LF_Event.inl \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
  $(TAO_ROOT)/tao/Service_Context.h \
  $(TAO_ROOT)/tao/Service_Context.inl \
@@ -6578,7 +6525,9 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
- $(TAO_ROOT)/tao/Thread_Lane_Resources.i
+ $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
+ $(TAO_ROOT)/tao/Blocked_Connect_Strategy.h \
+ $(TAO_ROOT)/tao/Connect_Strategy.h
 
 .obj/SHMIOP_Acceptor.o .obj/SHMIOP_Acceptor.so .shobj/SHMIOP_Acceptor.o .shobj/SHMIOP_Acceptor.so: SHMIOP_Acceptor.cpp SHMIOP_Acceptor.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -6712,8 +6661,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
- SHMIOP_Connection_Handler.h \
- $(ACE_ROOT)/ace/Reactor.h \
+ SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
  $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
@@ -6806,25 +6754,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SOCK.i \
- $(TAO_ROOT)/tao/Transport.h \
- $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Transport_Timer.h \
- $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
- $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
- $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
- $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
- $(TAO_ROOT)/tao/Transport.inl \
  $(TAO_ROOT)/tao/Connection_Handler.inl \
  SHMIOP_Transport.h strategies_export.h \
  $(ACE_ROOT)/ace/MEM_Stream.h \
@@ -6845,7 +6782,20 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/MEM_Stream.i \
- SHMIOP_Transport.i SHMIOP_Connection_Handler.inl \
+ $(TAO_ROOT)/tao/Transport.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Transport_Timer.h \
+ $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+ $(TAO_ROOT)/tao/Transport.inl SHMIOP_Transport.i \
+ SHMIOP_Connection_Handler.inl \
  $(TAO_ROOT)/tao/Acceptor_Impl.h \
  $(TAO_ROOT)/tao/Acceptor_Impl.i \
  $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
@@ -6943,14 +6893,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- SHMIOP_Endpoint.h SHMIOP_Endpoint.i SHMIOP_Profile.i \
+ $(TAO_ROOT)/tao/Object_KeyC.i SHMIOP_Endpoint.h \
+ SHMIOP_Endpoint.i SHMIOP_Profile.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i
 
 .obj/SHMIOP_Connection_Handler.o .obj/SHMIOP_Connection_Handler.so .shobj/SHMIOP_Connection_Handler.o .shobj/SHMIOP_Connection_Handler.so: SHMIOP_Connection_Handler.cpp \
- SHMIOP_Connection_Handler.h \
- $(ACE_ROOT)/ace/pre.h \
+ SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/pre.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -7147,12 +7096,34 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SOCK.i \
+ $(TAO_ROOT)/tao/Connection_Handler.inl \
+ SHMIOP_Transport.h strategies_export.h \
+ $(ACE_ROOT)/ace/MEM_Stream.h \
+ $(ACE_ROOT)/ace/MEM_IO.h \
+ $(ACE_ROOT)/ace/MEM_SAP.h \
+ $(ACE_ROOT)/ace/PI_Malloc.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/PI_Malloc.i \
+ $(ACE_ROOT)/ace/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(ACE_ROOT)/ace/MEM_SAP.i \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(ACE_ROOT)/ace/MEM_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/MEM_Stream.i \
  $(TAO_ROOT)/tao/Transport.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
@@ -7190,28 +7161,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
- $(TAO_ROOT)/tao/Transport.inl \
- $(TAO_ROOT)/tao/Connection_Handler.inl \
- SHMIOP_Transport.h strategies_export.h \
- $(ACE_ROOT)/ace/MEM_Stream.h \
- $(ACE_ROOT)/ace/MEM_IO.h \
- $(ACE_ROOT)/ace/MEM_SAP.h \
- $(ACE_ROOT)/ace/PI_Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/PI_Malloc.i \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/MEM_SAP.i \
- $(ACE_ROOT)/ace/Process_Semaphore.h \
- $(ACE_ROOT)/ace/Process_Semaphore.inl \
- $(ACE_ROOT)/ace/MEM_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/MEM_Stream.i \
- SHMIOP_Transport.i SHMIOP_Connection_Handler.inl \
+ $(TAO_ROOT)/tao/Transport.inl SHMIOP_Transport.i \
+ SHMIOP_Connection_Handler.inl \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/tao/debug.h \
@@ -7285,10 +7236,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Base_Transport_Property.inl \
  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
- SHMIOP_Endpoint.h \
- $(ACE_ROOT)/ace/MEM_Addr.h \
- $(ACE_ROOT)/ace/MEM_Addr.i \
- SHMIOP_Endpoint.i \
+ SHMIOP_Endpoint.h $(ACE_ROOT)/ace/MEM_Addr.h \
+ $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i \
  $(TAO_ROOT)/tao/Resume_Handle.h \
  $(TAO_ROOT)/tao/Resume_Handle.inl
 
@@ -7389,8 +7338,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Endpoint.i \
- strategies_export.h \
+ $(TAO_ROOT)/tao/Endpoint.i strategies_export.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(ACE_ROOT)/ace/SString.h \
@@ -7437,9 +7385,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/MEM_Addr.h \
- $(ACE_ROOT)/ace/MEM_Addr.i \
- SHMIOP_Endpoint.i SHMIOP_Connection_Handler.h \
- $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i \
+ SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
  $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
@@ -7532,10 +7479,29 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
  $(TAO_ROOT)/tao/Connection_Handler.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
  $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SOCK.i \
+ $(TAO_ROOT)/tao/Connection_Handler.inl \
+ SHMIOP_Transport.h $(ACE_ROOT)/ace/MEM_Stream.h \
+ $(ACE_ROOT)/ace/MEM_IO.h \
+ $(ACE_ROOT)/ace/MEM_SAP.h \
+ $(ACE_ROOT)/ace/PI_Malloc.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/PI_Malloc.i \
+ $(ACE_ROOT)/ace/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(ACE_ROOT)/ace/MEM_SAP.i \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(ACE_ROOT)/ace/MEM_IO.i \
+ $(ACE_ROOT)/ace/MEM_Stream.i \
  $(TAO_ROOT)/tao/Transport.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
@@ -7554,26 +7520,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
- $(TAO_ROOT)/tao/Transport.inl \
- $(TAO_ROOT)/tao/Connection_Handler.inl \
- SHMIOP_Transport.h \
- $(ACE_ROOT)/ace/MEM_Stream.h \
- $(ACE_ROOT)/ace/MEM_IO.h \
- $(ACE_ROOT)/ace/MEM_SAP.h \
- $(ACE_ROOT)/ace/PI_Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/PI_Malloc.i \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/MEM_SAP.i \
- $(ACE_ROOT)/ace/Process_Semaphore.h \
- $(ACE_ROOT)/ace/Process_Semaphore.inl \
- $(ACE_ROOT)/ace/MEM_IO.i \
- $(ACE_ROOT)/ace/MEM_Stream.i \
- SHMIOP_Transport.i SHMIOP_Connection_Handler.inl \
+ $(TAO_ROOT)/tao/Transport.inl SHMIOP_Transport.i \
+ SHMIOP_Connection_Handler.inl \
  $(TAO_ROOT)/tao/debug.h
 
 .obj/uiop_endpoints.o .obj/uiop_endpoints.so .shobj/uiop_endpoints.o .shobj/uiop_endpoints.so: uiop_endpoints.cpp uiop_endpoints.h \
@@ -7671,8 +7619,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- strategies_export.h \
+ $(TAO_ROOT)/tao/corbafwd.i strategies_export.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
  $(TAO_ROOT)/tao/Sequence.h \
@@ -7704,12 +7651,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.i \
- uiop_endpoints.i
+ $(TAO_ROOT)/tao/Any.i uiop_endpoints.i
 
 .obj/advanced_resource.o .obj/advanced_resource.so .shobj/advanced_resource.o .shobj/advanced_resource.so: advanced_resource.cpp advanced_resource.h \
- $(ACE_ROOT)/ace/pre.h \
- strategies_export.h \
+ $(ACE_ROOT)/ace/pre.h strategies_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -7909,9 +7854,9 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
@@ -7952,15 +7897,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- advanced_resource.i UIOP_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/ORB_Core.i advanced_resource.i \
+ UIOP_Factory.h $(TAO_ROOT)/tao/Protocol_Factory.h \
  SHMIOP_Factory.h DIOP_Factory.h LFU_Connection_Purging_Strategy.h \
  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
  FIFO_Connection_Purging_Strategy.h NULL_Connection_Purging_Strategy.h \
- LF_Strategy_Null.h \
- $(TAO_ROOT)/tao/LF_Strategy.h \
+ LF_Strategy_Null.h $(TAO_ROOT)/tao/LF_Strategy.h \
  $(TAO_ROOT)/tao/LF_Strategy.inl \
  LF_Strategy_Null.inl \
  $(TAO_ROOT)/tao/LRU_Connection_Purging_Strategy.h \
@@ -8005,8 +7948,7 @@ CPPFLAGS += -I$(TAO_ROOT)
 
 .obj/LFU_Connection_Purging_Strategy.o .obj/LFU_Connection_Purging_Strategy.so .shobj/LFU_Connection_Purging_Strategy.o .shobj/LFU_Connection_Purging_Strategy.so: LFU_Connection_Purging_Strategy.cpp \
  LFU_Connection_Purging_Strategy.h \
- $(ACE_ROOT)/ace/pre.h \
- strategies_export.h \
+ $(ACE_ROOT)/ace/pre.h strategies_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -8188,8 +8130,7 @@ CPPFLAGS += -I$(TAO_ROOT)
 .obj/FIFO_Connection_Purging_Strategy.o .obj/FIFO_Connection_Purging_Strategy.so .shobj/FIFO_Connection_Purging_Strategy.o .shobj/FIFO_Connection_Purging_Strategy.so: \
  FIFO_Connection_Purging_Strategy.cpp \
  FIFO_Connection_Purging_Strategy.h \
- $(ACE_ROOT)/ace/pre.h \
- strategies_export.h \
+ $(ACE_ROOT)/ace/pre.h strategies_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -8371,8 +8312,7 @@ CPPFLAGS += -I$(TAO_ROOT)
 .obj/NULL_Connection_Purging_Strategy.o .obj/NULL_Connection_Purging_Strategy.so .shobj/NULL_Connection_Purging_Strategy.o .shobj/NULL_Connection_Purging_Strategy.so: \
  NULL_Connection_Purging_Strategy.cpp \
  NULL_Connection_Purging_Strategy.h \
- $(ACE_ROOT)/ace/pre.h \
- strategies_export.h \
+ $(ACE_ROOT)/ace/pre.h strategies_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -8552,8 +8492,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Transport.inl
 
 .obj/LF_Strategy_Null.o .obj/LF_Strategy_Null.so .shobj/LF_Strategy_Null.o .shobj/LF_Strategy_Null.so: LF_Strategy_Null.cpp LF_Strategy_Null.h \
- $(ACE_ROOT)/ace/pre.h \
- strategies_export.h \
+ $(ACE_ROOT)/ace/pre.h strategies_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index 065abdfa78c..a23ea85b846 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -21,6 +21,7 @@ ACE_RCSID (Strategies,
            SHMIOP_Connector,
            "$Id$")
 
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class TAO_Connect_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>;
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 5b2925aacfa..70f3a9b55ab 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -112,9 +112,12 @@ TAO_UIOP_Connector::close (void)
 int
 TAO_UIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
 {
-  TAO_UIOP_Endpoint *uiop_endpoint =
-    this->remote_endpoint (endpoint);
+  if (endpoint->tag () != TAO_TAG_UIOP_PROFILE)
+    return -1;
 
+  TAO_UIOP_Endpoint *uiop_endpoint =
+    ACE_dynamic_cast (TAO_UIOP_Endpoint *,
+                      endpoint );
   if (uiop_endpoint == 0)
     return -1;
 
@@ -142,6 +145,8 @@ TAO_UIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
    return 0;
 }
 
+
+
 int
 TAO_UIOP_Connector::make_connection (TAO_GIOP_Invocation *invocation,
                                      TAO_Transport_Descriptor_Interface *desc)
@@ -151,8 +156,6 @@ TAO_UIOP_Connector::make_connection (TAO_GIOP_Invocation *invocation,
                   ACE_TEXT ("TAO (%P|%t) Connector::connect - ")
                   ACE_TEXT ("looking for UIOP connection.\n")));
 
-
-
   TAO_UIOP_Endpoint *uiop_endpoint =
     this->remote_endpoint (desc->endpoint ());
 
@@ -385,146 +388,4 @@ TAO_UIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
   return uiop_endpoint;
 }
 
-
-#if 0
-/**
- * @todo Needs to be removed
- */
-int
-TAO_UIOP_Connector::preconnect (const char *preconnects)
-{
-  // Check for the proper protocol prefix.
-  if (this->check_prefix (preconnects) != 0)
-    return 0; // Failure: zero successful preconnections
-
-  const char *protocol_removed =
-    ACE_OS::strstr (preconnects, "://") + 3;
-  // "+ 3" since strlen of "://" is 3.
-
-  char *preconnections =
-    ACE_OS::strdup (protocol_removed);
-
-  int successes = 0;
-  if (preconnections)
-    {
-      ACE_UNIX_Addr dest;
-      ACE_Unbounded_Stack<ACE_UNIX_Addr> dests;
-
-      size_t num_connections;
-
-      char *nextptr = 0;
-      char *where = 0;
-
-      for (where = ACE::strsplit_r (preconnections, ",", nextptr);
-           where != 0;
-           where = ACE::strsplit_r (0, ",", nextptr))
-        {
-          char *rendezvous_point = where;
-
-          int version_offset = 0;
-          // Additional offset to remove version from preconnect, if
-          // it exists.
-
-          if (isdigit (rendezvous_point[0]) &&
-              rendezvous_point[1] == '.' &&
-              isdigit (rendezvous_point[2]) &&
-              rendezvous_point[3] == '@')
-            version_offset = 4;
-
-          // @@ For now, we just drop the version prefix.  However, at
-          // some point in the future the version may become useful.
-
-          dest.set (rendezvous_point + version_offset);
-
-          dests.push (dest);
-        }
-
-      // Create an array of addresses from the stack, as well as an
-      // array of eventual handlers.
-      num_connections = dests.size ();
-      ACE_UNIX_Addr *remote_addrs = 0;
-      TAO_UIOP_Connection_Handler **handlers = 0;
-      char *failures = 0;
-
-      ACE_NEW_RETURN (remote_addrs,
-                      ACE_UNIX_Addr[num_connections],
-                      -1);
-
-      ACE_Auto_Basic_Array_Ptr<ACE_UNIX_Addr> safe_remote_addrs (remote_addrs);
-
-      ACE_NEW_RETURN (handlers,
-                      TAO_UIOP_Connection_Handler *[num_connections],
-                      -1);
-
-      ACE_Auto_Basic_Array_Ptr<TAO_UIOP_Connection_Handler *>
-        safe_handlers (handlers);
-
-      ACE_NEW_RETURN (failures,
-                      char[num_connections],
-                      -1);
-
-      // No longer need to worry about exception safety at this point.
-      remote_addrs = safe_remote_addrs.release ();
-      handlers = safe_handlers.release ();
-
-      size_t slot = 0;
-
-      // Fill in the remote address array
-      while (dests.pop (remote_addrs[slot]) == 0)
-        handlers[slot++] = 0;
-
-      // Finally, try to connect.
-      this->base_connector_.connect_n (num_connections,
-                                       handlers,
-                                       remote_addrs,
-                                       failures);
-
-      // Loop over all the failures and set the handlers that
-      // succeeded to idle state.
-      for (slot = 0;
-           slot < num_connections;
-           ++slot)
-        {
-          if (!failures[slot])
-            {
-              TAO_UIOP_Endpoint endpoint (remote_addrs[slot]);
-
-              TAO_Base_Transport_Property prop (&endpoint);
-
-              // Add the handler to Cache
-              int retval =
-                this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop,
-                                                                                         handlers[slot]->transport ());
-              ++successes;
-
-              if (retval != 0 && TAO_debug_level > 4)
-                ACE_DEBUG ((LM_DEBUG,
-                            ACE_TEXT ("TAO (%P|%t) Unable to add handles\n"),
-                            ACE_TEXT ("to cache \n")));
-
-              if (TAO_debug_level > 0)
-                ACE_DEBUG ((LM_DEBUG,
-                            "TAO (%P|%t) Preconnection <%s> succeeded.\n",
-                            remote_addrs[slot].get_path_name ()));
-            }
-          else if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO (%P|%t) Preconnection <%s> failed.\n",
-                        remote_addrs[slot].get_path_name ()));
-        }
-
-      ACE_OS::free (preconnections);
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) UIOP preconnections: %d successes and "
-                    "%d failures.\n",
-                    successes,
-                    num_connections - successes));
-    }
-
-  return successes;
-}
-#endif /*if 0*/
-
 #endif /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index cdf2e8e78d3..0303f6e27ed 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -465,7 +465,7 @@ TAO_Stub::get_policy (CORBA::PolicyType type
   // e.g., to add methods for policy specific reconciliation, etc.
 
   return this->get_client_policy (type
-                                   ACE_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Policy_ptr
@@ -480,7 +480,7 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type
   if (this->policies_ != 0)
     {
       result = this->policies_->get_policy (type
-                                             ACE_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
     }
 
@@ -488,7 +488,7 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type
     {
       TAO_Policy_Current &policy_current = this->orb_core_->policy_current ();
       result = policy_current.get_policy (type
-                                           ACE_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
     }
 
@@ -502,7 +502,7 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type
       if (policy_manager != 0)
         {
           result = policy_manager->get_policy (type
-                                                ACE_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::Policy::_nil ());
         }
     }
@@ -574,7 +574,7 @@ TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types
     return 0;
 
   return this->policies_->get_policy_overrides (types
-                                                 ACE_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
@@ -635,7 +635,7 @@ TAO_Stub::sync_strategy (void)
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
   int has_synchronization;
-  int scope;
+  Messaging::SyncScope scope;
 
   this->orb_core_->call_sync_scope_hook (this,
                                          has_synchronization,
@@ -652,110 +652,117 @@ TAO_Stub::sync_strategy (void)
 
 #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
 
-CORBA::Policy *
+CORBA::Policy_ptr
 TAO_Stub::relative_roundtrip_timeout (void)
 {
-  CORBA::Policy *result = 0;
+  CORBA::Policy_var p;
 
   // No need to lock, the stub only changes its policies at
   // construction time...
   if (this->policies_ != 0)
-      result = this->policies_->get_cached_policy (TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
+    p = this->policies_->get_cached_policy (
+          TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
 
   // No need to lock, the object is in TSS storage....
-  if (result == 0)
+  if (CORBA::is_nil (p.in ()))
     {
       TAO_Policy_Current &policy_current =
         this->orb_core_->policy_current ();
-      result = policy_current.get_cached_policy (TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
+      p = policy_current.get_cached_policy (
+            TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
     }
 
   // @@ Must lock, but is is harder to implement than just modifying
   //    this call: the ORB does take a lock to modify the policy
   //    manager
-  if (result == 0)
+  if (CORBA::is_nil (p.in ()))
     {
       TAO_Policy_Manager *policy_manager =
         this->orb_core_->policy_manager ();
       if (policy_manager != 0)
-        result = policy_manager->get_cached_policy (TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
+        p = policy_manager->get_cached_policy (
+              TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
     }
 
-  if (result == 0)
-    result = this->orb_core_->get_default_policies ()->get_cached_policy (TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
+  if (CORBA::is_nil (p.in ()))
+    p = this->orb_core_->get_default_policies ()->get_cached_policy (
+          TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
 
-  return result;
+  return p._retn ();
 }
 
-#endif /* TAO_HAS_REALTIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
+#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
 
 #if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
 
-CORBA::Policy *
+CORBA::Policy_ptr
 TAO_Stub::sync_scope (void)
 {
-  CORBA::Policy *result = 0;
+  CORBA::Policy_var p;
 
   // No need to lock, the stub only changes its policies at
   // construction time...
   if (this->policies_ != 0)
-    result = this->policies_->get_cached_policy (TAO_CACHED_POLICY_SYNC_SCOPE);
+    p = this->policies_->get_cached_policy (TAO_CACHED_POLICY_SYNC_SCOPE);
 
   // If there are no cached policies, look at the thread or ORB level
   // for the policy.
-  if (result == 0)
-    this->orb_core_->stubless_sync_scope (result);
+  if (CORBA::is_nil (p.in ()))
+    p = this->orb_core_->stubless_sync_scope ();
 
-  return result;
+  return p._retn ();
 }
 
 #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
-CORBA::Policy *
+CORBA::Policy_ptr
 TAO_Stub::buffering_constraint (void)
 {
-  CORBA::Policy *result = 0;
+  CORBA::Policy_var p;
 
   // No need to lock, the stub only changes its policies at
   // construction time...
 
   if (this->policies_ != 0)
     {
-      result =
-        this->policies_->get_cached_policy (TAO_CACHED_POLICY_BUFFERING_CONSTRAINT);
+      p =
+        this->policies_->get_cached_policy (
+          TAO_CACHED_POLICY_BUFFERING_CONSTRAINT);
     }
 
   // No need to lock, the object is in TSS storage....
-  if (result == 0)
+  if (CORBA::is_nil (p.in ()))
     {
       TAO_Policy_Current &policy_current =
         this->orb_core_->policy_current ();
 
-      result =
-        policy_current.get_cached_policy (TAO_CACHED_POLICY_BUFFERING_CONSTRAINT);
+      p =
+        policy_current.get_cached_policy (
+          TAO_CACHED_POLICY_BUFFERING_CONSTRAINT);
     }
 
   // @@ Must lock, but is is harder to implement than just modifying
   //    this call: the ORB does take a lock to modify the policy
   //    manager
-  if (result == 0)
+  if (CORBA::is_nil (p.in ()))
     {
       TAO_Policy_Manager *policy_manager =
         this->orb_core_->policy_manager ();
       if (policy_manager != 0)
         {
-          result =
-            policy_manager->get_cached_policy (TAO_CACHED_POLICY_BUFFERING_CONSTRAINT);
+          p =
+            policy_manager->get_cached_policy (
+              TAO_CACHED_POLICY_BUFFERING_CONSTRAINT);
         }
     }
 
-  if (result == 0)
-    result = this->orb_core_->default_buffering_constraint ();
+  if (CORBA::is_nil (p.in ()))
+    p = this->orb_core_->default_buffering_constraint ();
 
-  return result;
+  return p._retn ();
 }
 
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
@@ -767,7 +774,11 @@ TAO_Stub::buffering_constraint (void)
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
 template class auto_ptr<TAO_Policy_Set>;
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
 template class ACE_Auto_Basic_Ptr<TAO_Policy_Set>;
+#  endif  /* ACE_LACKS_AUTO_PTR */
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -776,7 +787,11 @@ template class ACE_Auto_Basic_Ptr<TAO_Policy_Set>;
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
 #pragma instantiate auto_ptr<TAO_Policy_Set>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Policy_Set>
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Policy_Set>
+#  endif  /* ACE_LACKS_AUTO_PTR */
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index b2f78a9740c..f68d227e0f5 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -122,16 +122,23 @@ public:
   //   Object scope, then at the Current scope, then at the ORB scope,
   //   and, finally, ORB default values are checked.
 
+#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
+
   CORBA::Policy_ptr relative_roundtrip_timeout (void);
 
+#endif  /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
+
+#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
+
   CORBA::Policy_ptr sync_scope (void);
 
+#endif  /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
+
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
   CORBA::Policy_ptr buffering_constraint (void);
 
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
+#endif  /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 
   /// Return the sync strategy to be used in by the transport.
   /// Selection will be based on the SyncScope policies.
diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index 185110e2394..d0e3f7c56d7 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id$ */
+// $Id$
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -21,20 +21,23 @@
 
 #include "TAOC.h"
 
-#include "tao/Typecode.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
 #if !defined (__ACE_INLINE__)
 #include "TAOC.i"
 #endif /* !defined INLINE */
 
-
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
 static const CORBA::Long _oc_TAO_BufferingConstraintMode[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
+  40,
   ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x74616f2f),
   ACE_NTOHL (0x54414f2f),
   ACE_NTOHL (0x42756666),
   ACE_NTOHL (0x6572696e),
@@ -42,7 +45,7 @@ static const CORBA::Long _oc_TAO_BufferingConstraintMode[] =
   ACE_NTOHL (0x73747261),
   ACE_NTOHL (0x696e744d),
   ACE_NTOHL (0x6f64653a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO/BufferingConstraintMode:1.0
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraintMode:1.0
   24,
   ACE_NTOHL (0x42756666),
   ACE_NTOHL (0x6572696e),
@@ -64,7 +67,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintMode (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_BufferingConstraintMode, &_tc_TAO_tc_TAO_BufferingConstraintMode)
+TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_BufferingConstraintMode, &_tc_TAO_tc_TAO_BufferingConstraintMode)
 TAO_NAMESPACE_END
 
 TAO_NAMESPACE_TYPE (const CORBA::UShort)
@@ -86,15 +89,16 @@ TAO_NAMESPACE_END
 static const CORBA::Long _oc_TAO_BufferingConstraint[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
+  36,
   ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x74616f2f),
   ACE_NTOHL (0x54414f2f),
   ACE_NTOHL (0x42756666),
   ACE_NTOHL (0x6572696e),
   ACE_NTOHL (0x67436f6e),
   ACE_NTOHL (0x73747261),
   ACE_NTOHL (0x696e743a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO/BufferingConstraint:1.0
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraint:1.0
   20,
   ACE_NTOHL (0x42756666),
   ACE_NTOHL (0x6572696e),
@@ -106,10 +110,11 @@ static const CORBA::Long _oc_TAO_BufferingConstraint[] =
   ACE_NTOHL (0x6d6f6465),
   ACE_NTOHL (0x0),  // name = mode
   CORBA::tk_alias, // typecode kind for typedefs
-  76, // encapsulation length
+  80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    36,
+    40,
     ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x74616f2f),
     ACE_NTOHL (0x54414f2f),
     ACE_NTOHL (0x42756666),
     ACE_NTOHL (0x6572696e),
@@ -117,7 +122,7 @@ static const CORBA::Long _oc_TAO_BufferingConstraint[] =
     ACE_NTOHL (0x73747261),
     ACE_NTOHL (0x696e744d),
     ACE_NTOHL (0x6f64653a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO/BufferingConstraintMode:1.0
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraintMode:1.0
     24,
     ACE_NTOHL (0x42756666),
     ACE_NTOHL (0x6572696e),
@@ -175,12 +180,12 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraint (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_BufferingConstraint, &_tc_TAO_tc_TAO_BufferingConstraint)
+TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_BufferingConstraint, &_tc_TAO_tc_TAO_BufferingConstraint)
 TAO_NAMESPACE_END
 
-void TAO::BufferingConstraint::_tao_any_destructor (void *x)
+void TAO::BufferingConstraint::_tao_any_destructor (void *_tao_void_pointer)
 {
-  BufferingConstraint *tmp = ACE_static_cast (BufferingConstraint*,x);
+  BufferingConstraint *tmp = ACE_static_cast (BufferingConstraint*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -189,10 +194,58 @@ TAO_NAMESPACE_BEGIN (TAO)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, BUFFERING_CONSTRAINT_POLICY_TYPE, 1413545985U)
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// be/be_visitor_interface/interface_cs.cpp:67
+
 int TAO::BufferingConstraintPolicy::_tao_class_id = 0;
 
+TAO::BufferingConstraintPolicy_ptr
+tao_TAO_BufferingConstraintPolicy_duplicate (
+    TAO::BufferingConstraintPolicy_ptr p
+  )
+{
+  return TAO::BufferingConstraintPolicy::_duplicate (p);
+}
+
+void
+tao_TAO_BufferingConstraintPolicy_release (
+    TAO::BufferingConstraintPolicy_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+TAO::BufferingConstraintPolicy_ptr
+tao_TAO_BufferingConstraintPolicy_nil (
+    void
+  )
+{
+  return TAO::BufferingConstraintPolicy::_nil ();
+}
+
+TAO::BufferingConstraintPolicy_ptr
+tao_TAO_BufferingConstraintPolicy_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return TAO::BufferingConstraintPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+tao_TAO_BufferingConstraintPolicy_upcast (
+    void *src
+  )
+{
+  TAO::BufferingConstraintPolicy **tmp =
+    ACE_static_cast (TAO::BufferingConstraintPolicy **, src);
+  return *tmp;
+}
+
 // *************************************************************
-// Operations for class TAO::BufferingConstraintPolicy_var
+// TAO::BufferingConstraintPolicy_var
+// TAO_IDL - Generated from
+// be/be_interface.cpp:654
 // *************************************************************
 
 TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (void) // default constructor
@@ -313,8 +366,11 @@ TAO::BufferingConstraintPolicy_var::tao_upcast (void *src)
     ACE_static_cast (BufferingConstraintPolicy **, src);
   return *tmp;
 }
+
 // *************************************************************
-// Inline operations for class TAO::BufferingConstraintPolicy_out
+// TAO::BufferingConstraintPolicy_out
+// TAO_IDL - Generated from
+// be/be_interface.cpp:932
 // *************************************************************
 
 TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (BufferingConstraintPolicy_ptr &p)
@@ -373,15 +429,21 @@ TAO::BufferingConstraintPolicy_out::operator-> (void)
 }
 
 
-// default constructor
-TAO::BufferingConstraintPolicy::BufferingConstraintPolicy ()
-{
-  }
+// TAO_IDL - Generated from
+// be/be_visitor_interface/interface_cs.cpp:198
+
+TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void)
+{}
 
-// destructor
 TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void)
 {}
 
+void TAO::BufferingConstraintPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  BufferingConstraintPolicy *tmp = ACE_static_cast (BufferingConstraintPolicy*, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
 TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
@@ -390,7 +452,8 @@ TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_narrow (
   return BufferingConstraintPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_unchecked_narrow (
+TAO::BufferingConstraintPolicy_ptr
+TAO::BufferingConstraintPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -425,11 +488,11 @@ void *TAO::BufferingConstraintPolicy::_tao_QueryInterface (ptr_arith_t type)
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &BufferingConstraintPolicy::_tao_class_id))
+      &ACE_NESTED_CLASS (::TAO, BufferingConstraintPolicy)::_tao_class_id))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &CORBA::Policy::_tao_class_id))
+      &::CORBA::Policy::_tao_class_id))
     retv = ACE_reinterpret_cast
       (
         void *,
@@ -450,58 +513,49 @@ void *TAO::BufferingConstraintPolicy::_tao_QueryInterface (ptr_arith_t type)
 
 const char* TAO::BufferingConstraintPolicy::_interface_repository_id (void) const
 {
-  return "IDL:TAO/BufferingConstraintPolicy:1.0";
+  return "IDL:tao/TAO/BufferingConstraintPolicy:1.0";
 }
 
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-static const CORBA::Long _oc_TAO_SyncScope[] =
+static const CORBA::Long _oc_TAO_BufferingConstraintPolicy[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  22,
+  42,
   ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x74616f2f),
   ACE_NTOHL (0x54414f2f),
-  ACE_NTOHL (0x53796e63),
-  ACE_NTOHL (0x53636f70),
-  ACE_NTOHL (0x653a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO/SyncScope:1.0
-  10,
-  ACE_NTOHL (0x53796e63),
-  ACE_NTOHL (0x53636f70),
-  ACE_NTOHL (0x65000000),  // name = SyncScope
-  CORBA::tk_short,
-
+  ACE_NTOHL (0x42756666),
+  ACE_NTOHL (0x6572696e),
+  ACE_NTOHL (0x67436f6e),
+  ACE_NTOHL (0x73747261),
+  ACE_NTOHL (0x696e7450),
+  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x793a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:tao/TAO/BufferingConstraintPolicy:1.0
+  26,
+  ACE_NTOHL (0x42756666),
+  ACE_NTOHL (0x6572696e),
+  ACE_NTOHL (0x67436f6e),
+  ACE_NTOHL (0x73747261),
+  ACE_NTOHL (0x696e7450),
+  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x79000000),  // name = BufferingConstraintPolicy
 };
 
-static CORBA::TypeCode _tc_TAO_tc_TAO_SyncScope (
-    CORBA::tk_alias,
-    sizeof (_oc_TAO_SyncScope),
-    (char *) &_oc_TAO_SyncScope,
+static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_TAO_BufferingConstraintPolicy),
+    (char *) &_oc_TAO_BufferingConstraintPolicy,
     0,
-    sizeof (TAO::SyncScope)
+    sizeof (TAO::BufferingConstraintPolicy)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SyncScope, &_tc_TAO_tc_TAO_SyncScope)
+TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_BufferingConstraintPolicy, &_tc_TAO_tc_TAO_BufferingConstraintPolicy)
 TAO_NAMESPACE_END
 
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_NONE, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_TRANSPORT, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_SERVER, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_TARGET, 3)
-TAO_NAMESPACE_END
+#endif  /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
+
 TAO_NAMESPACE_TYPE (const CORBA::Short)
 TAO_NAMESPACE_BEGIN (TAO)
 TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_EAGER_BUFFERING, 0)
@@ -511,92 +565,206 @@ TAO_NAMESPACE_BEGIN (TAO)
 TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_DELAYED_BUFFERING, -2)
 TAO_NAMESPACE_END
 
-
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
-void operator<<= (CORBA::Any &_tao_any, const TAO::BufferingConstraint &_tao_elem) // copying
+// TAO_IDL - Generated from
+// be/be_visitor_structure/any_op_cs.cpp:58
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TAO::BufferingConstraint &_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      TAO::_tc_BufferingConstraint,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
+
+  if (stream << _tao_elem)
+    {
+      _tao_any._tao_replace (
+          TAO::_tc_BufferingConstraint,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, TAO::BufferingConstraint *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO::BufferingConstraint *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      TAO::_tc_BufferingConstraint,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TAO::BufferingConstraint::_tao_any_destructor
-    );
+
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          TAO::_tc_BufferingConstraint,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          TAO::BufferingConstraint::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO::BufferingConstraint *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO::BufferingConstraint *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const TAO::BufferingConstraint*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const TAO::BufferingConstraint *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO::BufferingConstraint *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TAO::BufferingConstraint *&_tao_elem
+  )
 {
   _tao_elem = 0;
+
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
+
     CORBA::Boolean result =
-      type->equivalent (TAO::_tc_BufferingConstraint ACE_ENV_ARG_PARAMETER);
+      type->equivalent (
+          TAO::_tc_BufferingConstraint
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
 
-    if (!result)
+    if (result == 0)
       {
-        return 0;
+        return 0; // not equivalent
       }
 
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const TAO::BufferingConstraint*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      TAO::BufferingConstraint *tmp;
-      ACE_NEW_RETURN (tmp, TAO::BufferingConstraint, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TAO::_tc_BufferingConstraint,
-            1,
-            ACE_static_cast (void *, tmp),
-            TAO::BufferingConstraint::_tao_any_destructor
+        _tao_elem = ACE_static_cast (
+            const TAO::BufferingConstraint*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        TAO::BufferingConstraint *tmp;
+        ACE_NEW_RETURN (
+            tmp,
+            TAO::BufferingConstraint,
+            0
+          );
+
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                TAO::_tc_BufferingConstraint,
+                1,
+                ACE_static_cast (void *, tmp),
+                TAO::BufferingConstraint::_tao_any_destructor
+              );
+
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+
+  return 0;
+}
+
+
+// TAO_IDL - Generated from
+// be/be_visitor_interface/any_op_cs.cpp:60
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO::BufferingConstraintPolicy_ptr _tao_elem
+  )
+{
+  _tao_any._tao_replace (
+      TAO::_tc_BufferingConstraintPolicy,
+      1,
+      TAO::BufferingConstraintPolicy::_duplicate (_tao_elem),
+      TAO::BufferingConstraintPolicy::_tao_any_destructor
+    );
+
+  _tao_any.contains_local (1);
+}
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO::BufferingConstraintPolicy_ptr *_tao_elem
+  )
+{
+  _tao_any._tao_replace (
+      TAO::_tc_BufferingConstraintPolicy,
+      1,
+      *_tao_elem,
+      TAO::BufferingConstraintPolicy::_tao_any_destructor
+    );
+
+  _tao_any.contains_local (1);
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO::BufferingConstraintPolicy_ptr &_tao_elem
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    _tao_elem = TAO::BufferingConstraintPolicy::_nil ();
+    CORBA::TypeCode_var type = _tao_any.type ();
+
+    CORBA::Boolean result =
+      type->equivalent (
+          TAO::_tc_BufferingConstraintPolicy
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+
+    if (!result)
+      {
+        return 0; // not equivalent
+      }
+
+    _tao_elem =
+      ACE_reinterpret_cast (
+          TAO::BufferingConstraintPolicy_ptr,
+          ACE_const_cast (void *, _tao_any.value ())
+        );
+
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+  }
+  ACE_ENDTRY;
+
+  _tao_elem = TAO::BufferingConstraintPolicy::_nil ();
   return 0;
 }
 
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
+#endif  /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h
index 18971c54055..69342793564 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id$ Id: TAOC.h,v 1.24 2000/06/28 03:47:12 marina Exp $ */
+// $Id$
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -19,15 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
 #ifndef _TAO_IDL_ORIG_TAOC_H_
 #define _TAO_IDL_ORIG_TAOC_H_
+
 #include "ace/pre.h"
 
 #include "tao/corbafwd.h"
@@ -36,12 +30,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-#include "tao/PolicyC.h"
-#include "tao/TimeBaseC.h"
-
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
+#include "PolicyC.h"
+#include "TimeBaseC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -68,12 +58,11 @@
 
 TAO_NAMESPACE  TAO
 {
-
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
   typedef CORBA::UShort BufferingConstraintMode;
   typedef CORBA::UShort_out BufferingConstraintMode_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BufferingConstraintMode;
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintMode;
 
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort BUFFER_FLUSH;
 
@@ -99,20 +88,23 @@ TAO_NAMESPACE  TAO
     TimeBase::TimeT timeout;
     CORBA::ULong message_count;
     CORBA::ULong message_bytes;
+
   };
 
   class TAO_Export BufferingConstraint_var
   {
   public:
-    BufferingConstraint_var (void); // default constructor
+    BufferingConstraint_var (void);
     BufferingConstraint_var (BufferingConstraint *);
-    BufferingConstraint_var (const BufferingConstraint_var &); // copy constructor
-    BufferingConstraint_var (const BufferingConstraint &); // fixed-size types only
-    ~BufferingConstraint_var (void); // destructor
+    BufferingConstraint_var (const BufferingConstraint_var &);
+    // Fixed-size types only.
+    BufferingConstraint_var (const BufferingConstraint &);
+    ~BufferingConstraint_var (void);
 
     BufferingConstraint_var &operator= (BufferingConstraint *);
     BufferingConstraint_var &operator= (const BufferingConstraint_var &);
-    BufferingConstraint_var &operator= (const BufferingConstraint &); // fixed-size types only
+    // Fixed-size types only.
+    BufferingConstraint_var &operator= (const BufferingConstraint &);
     BufferingConstraint *operator-> (void);
     const BufferingConstraint *operator-> (void) const;
 
@@ -133,7 +125,7 @@ TAO_NAMESPACE  TAO
 
   typedef BufferingConstraint &BufferingConstraint_out;
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BufferingConstraint;
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraint;
 
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong BUFFERING_CONSTRAINT_POLICY_TYPE;
 
@@ -176,7 +168,10 @@ TAO_NAMESPACE  TAO
     static BufferingConstraintPolicy_ptr tao_duplicate (BufferingConstraintPolicy_ptr);
     static void tao_release (BufferingConstraintPolicy_ptr);
     static BufferingConstraintPolicy_ptr tao_nil (void);
-    static BufferingConstraintPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
+    static BufferingConstraintPolicy_ptr tao_narrow (
+        CORBA::Object *
+        ACE_ENV_ARG_DECL_NOT_USED
+      );
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -213,11 +208,18 @@ TAO_NAMESPACE  TAO
 
 #endif /* end #if !defined */
 
+  // *************************************************************
+  // TAO::BufferingConstraintPolicy
+  // TAO_IDL - Generated from
+  // be/be_visitor_interface/interface_ch.cpp:106
+  // *************************************************************
+
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY_CH_
 
-class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy
+  class TAO_Export BufferingConstraintPolicy
+    : public virtual CORBA::Policy
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -225,26 +227,32 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy
     typedef BufferingConstraintPolicy_var _var_type;
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static int _tao_class_id;
+    static int _tao_class_id;
 
-    // the static operations
+    // The static operations.
     static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj);
+
     static BufferingConstraintPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
 
     static BufferingConstraintPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
 
     static BufferingConstraintPolicy_ptr _nil (void)
       {
         return (BufferingConstraintPolicy_ptr)0;
       }
 
-    virtual TAO::BufferingConstraint buffering_constraint (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    static void _tao_any_destructor (void*);
+
+    virtual ::TAO::BufferingConstraint buffering_constraint (
 
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -255,7 +263,9 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy
 
   protected:
     BufferingConstraintPolicy (void);
+
     virtual ~BufferingConstraintPolicy (void);
+
   private:
     BufferingConstraintPolicy (const BufferingConstraintPolicy &);
     void operator= (const BufferingConstraintPolicy &);
@@ -264,19 +274,9 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy
 
 #endif /* end #if !defined */
 
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-  typedef CORBA::Short SyncScope;
-  typedef CORBA::Short_out SyncScope_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SyncScope;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_NONE;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TRANSPORT;
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy;
 
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_SERVER;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TARGET;
+#endif  /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_EAGER_BUFFERING;
 
@@ -291,18 +291,16 @@ TAO_Export void operator<<= (CORBA::Any &, const TAO::BufferingConstraint &); //
 TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraint*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraint *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::BufferingConstraint *&);
-
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
+// Any operators for interface TAO::BufferingConstraintPolicy
+TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraintPolicy_ptr &);
 
 #ifndef __ACE_INLINE__
 
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::BufferingConstraint &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &);
 
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
 #endif /* __ACE_INLINE__ */
 
 
@@ -310,6 +308,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &
 #include "TAOC.i"
 #endif /* defined INLINE */
 
+#endif  /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
+
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/TAOC.i b/TAO/tao/TAOC.i
index b05d24f8ae2..7e14a90ba54 100644
--- a/TAO/tao/TAOC.i
+++ b/TAO/tao/TAOC.i
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id$ TAOC.i,v 1.8 2001/01/17 02:59:45 parsons Exp $ */
+// $Id$
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -20,12 +20,6 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // *************************************************************
-// Inline operations for class TAO::PrioritySpecification_var
-// *************************************************************
-
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-// *************************************************************
 // Inline operations for class TAO::BufferingConstraint_var
 // *************************************************************
 
@@ -81,19 +75,19 @@ TAO::BufferingConstraint_var::operator= (const ::TAO::BufferingConstraint_var &p
         }
       else
         {
-          TAO::BufferingConstraint *deep_copy =
-            new TAO::BufferingConstraint (*p.ptr_);
-
+          BufferingConstraint *deep_copy =
+            new BufferingConstraint (*p.ptr_);
+          
           if (deep_copy != 0)
             {
-              TAO::BufferingConstraint *tmp = deep_copy;
+              BufferingConstraint *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -128,13 +122,13 @@ TAO::BufferingConstraint_var::operator const ::TAO::BufferingConstraint &() cons
 }
 
 ACE_INLINE
-TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() // cast
+TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() const // cast
+TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() const // cast 
 {
   return *this->ptr_;
 }
@@ -151,7 +145,7 @@ TAO::BufferingConstraint_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for fixed size
+// mapping for fixed size 
 ACE_INLINE ::TAO::BufferingConstraint &
 TAO::BufferingConstraint_var::out (void)
 {
@@ -170,52 +164,10 @@ TAO::BufferingConstraint_var::ptr (void) const
   return this->ptr_;
 }
 
+
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___CI_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY___CI_
 
-ACE_INLINE TAO::BufferingConstraintPolicy_ptr
-tao_TAO_BufferingConstraintPolicy_duplicate (
-    TAO::BufferingConstraintPolicy_ptr p
-  )
-{
-  return TAO::BufferingConstraintPolicy::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_TAO_BufferingConstraintPolicy_release (
-    TAO::BufferingConstraintPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE TAO::BufferingConstraintPolicy_ptr
-tao_TAO_BufferingConstraintPolicy_nil (
-    void
-  )
-{
-  return TAO::BufferingConstraintPolicy::_nil ();
-}
-
-ACE_INLINE TAO::BufferingConstraintPolicy_ptr
-tao_TAO_BufferingConstraintPolicy_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return TAO::BufferingConstraintPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Object *
-tao_TAO_BufferingConstraintPolicy_upcast (
-    void *src
-  )
-{
-  TAO::BufferingConstraintPolicy **tmp =
-    ACE_static_cast (TAO::BufferingConstraintPolicy **, src);
-  return *tmp;
-}
-
 
 #endif /* end #if !defined */
 
@@ -230,7 +182,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO::BufferingC
     return 1;
   else
     return 0;
-
+  
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO::BufferingConstraint &_tao_aggregate)
@@ -244,7 +196,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO::BufferingConstrai
     return 1;
   else
     return 0;
-
+  
 }
 
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index db34ab04558..8f4d77455bb 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -788,7 +788,7 @@ TAO_Transport::handle_input_i (TAO_Resume_Handle &rh,
         {
           if (TAO_debug_level > 2)
             ACE_DEBUG ((LM_DEBUG,
-                        ACE_LIB_TEXT("TAO (%P|%t) TAO::handle_input_i,")
+                        ACE_LIB_TEXT("TAO (%P|%t) Transport::handle_input_i,")
                         ACE_LIB_TEXT("error while parsing the head of the queue \n")));
 
           this->tms_->connection_closed ();
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index 6a61efb9a60..e5602d32234 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -20,6 +20,7 @@ ACE_RCSID (tao,
            Connector,
            "$Id$")
 
+
 // Connector
 TAO_Connector::TAO_Connector (CORBA::ULong tag)
   : active_connect_strategy_ (0),
diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h
index db32309d2ef..7101b78a4be 100644
--- a/TAO/tao/Transport_Connector.h
+++ b/TAO/tao/Transport_Connector.h
@@ -4,7 +4,11 @@
 /**
  *  @file Connector.h
  *
+<<<<<<< Transport_Connector.h
  *  $Id$
+=======
+ *  $Id$
+>>>>>>> 1.3.2.1
  *
  *  Define the interface for the Connector component in TAO's
  *  pluggable protocol framework.
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index 508f97f2c40..e4dedca4d79 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -31,7 +31,8 @@ ACE_RCSID (tao,
 
 
 CORBA_TypeCode::Bounds::Bounds (void)
-  : CORBA_UserException ("IDL:omg.org/CORBA/TypeCode/Bounds:1.0")
+  : CORBA_UserException ("IDL:omg.org/CORBA/TypeCode/Bounds:1.0",
+                         "Bounds")
 {
 }
 
@@ -72,8 +73,11 @@ void CORBA_TypeCode::Bounds::_tao_encode (
     ACE_ENV_ARG_DECL
   ) const
 {
-  if (cdr << this->_id ())
-    return;
+  if (cdr << this->_rep_id ())
+    {
+      return;
+    }
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -85,7 +89,8 @@ void CORBA_TypeCode::Bounds::_tao_decode (TAO_InputCDR &
 // ****************************************************************
 
 CORBA_TypeCode::BadKind::BadKind (void)
-  : CORBA_UserException ("IDL:omg.org/CORBA/TypeCode/BadKind:1.0")
+  : CORBA_UserException ("IDL:omg.org/CORBA/TypeCode/BadKind:1.0",
+                         "BadKind")
 {
 }
 
@@ -119,8 +124,11 @@ void CORBA_TypeCode::BadKind::_tao_encode (
     ACE_ENV_ARG_DECL
   ) const
 {
-  if (cdr << this->_id ())
-    return;
+  if (cdr << this->_rep_id ())
+    {
+      return;
+    }
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index 5ee54b41718..0047bc59a12 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -43,7 +43,10 @@
 
 // Default constructor.
 CORBA::WrongTransaction::WrongTransaction (void)
-  : CORBA_UserException ("IDL:omg.org/CORBA/WrongTransaction:1.0")
+  : CORBA_UserException (
+        "IDL:omg.org/CORBA/WrongTransaction:1.0",
+        "WrongTransaction"
+      )
 {
 }
 
@@ -54,7 +57,10 @@ CORBA::WrongTransaction::~WrongTransaction (void)
 
 // Copy constructor.
 CORBA::WrongTransaction::WrongTransaction (const ::CORBA::WrongTransaction &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
@@ -75,7 +81,7 @@ void CORBA::WrongTransaction::_tao_any_destructor (void *_tao_void_pointer)
 CORBA::WrongTransaction *
 CORBA::WrongTransaction::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/WrongTransaction:1.0", exc->_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/WrongTransaction:1.0", exc->_rep_id ()))
     {
       return ACE_dynamic_cast (WrongTransaction *, exc);
     }
diff --git a/TAO/tao/WrongTransactionC.i b/TAO/tao/WrongTransactionC.i
index 023f5a5cea6..84fd54d23eb 100644
--- a/TAO/tao/WrongTransactionC.i
+++ b/TAO/tao/WrongTransactionC.i
@@ -26,7 +26,7 @@
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::WrongTransaction &_tao_aggregate)
 {
   // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
+  if (strm << _tao_aggregate._rep_id ())
     return 1;
   else
     return 0;
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index e280ccd5040..857f7eac303 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -880,11 +880,19 @@ ACE_FACTORY_DEFINE (TAO, TAO_Default_Resource_Factory)
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class auto_ptr<TAO_Protocol_Factory>;
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
 template class ACE_Auto_Basic_Ptr<TAO_Protocol_Factory>;
+#  endif  /* ACE_LACKS_AUTO_PTR */
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate auto_ptr<TAO_Protocol_Factory>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Protocol_Factory>
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Protocol_Factory>
+#  endif  /* ACE_LACKS_AUTO_PTR */
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 7e0c7b6a6b4..317de256ed0 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -849,20 +849,6 @@ enum TAO_MCAST_SERVICEID
 #define TAO_RT_PRIVATE_CONNECTION_POLICY_TYPE 44
 #define TAO_RT_PRIORITY_BANDED_CONNECTION_POLICY_TYPE 45
 
-#define TAO_MESSAGING_REBIND_POLICY_TYPE 23
-#define TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE 24
-#define TAO_MESSAGING_REQUEST_PRIORITY_POLICY_TYPE 25
-#define TAO_MESSAGING_REPLY_PRIORITY_POLICY_TYPE 26
-#define TAO_MESSAGING_REQUEST_START_TIME_POLICY_TYPE 27
-#define TAO_MESSAGING_REQUEST_END_TIME_POLICY_TYPE 28
-#define TAO_MESSAGING_REPLY_START_TIME_POLICY_TYPE 29
-#define TAO_MESSAGING_REPLY_END_TIME_POLICY_TYPE 30
-#define TAO_MESSAGING_RELATIVE_REQ_TIMEOUT_POLICY_TYPE 31
-#define TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE 32
-#define TAO_MESSAGING_ROUTING_POLICY_TYPE 33
-#define TAO_MESSAGING_MAX_HOPS_POLICY_TYPE 34
-#define TAO_MESSAGING_QUEUE_ORDER_POLICY_TYPE 35
-
 /// Policies that are accessed on the critical path and need to be
 /// incur minimal retrieval overhead.
 enum TAO_Cached_Policy_Type