ChangeLogTag:Fri Jun 10 13:07:04 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

31 files changed, 189 insertions, 128 deletions

diff --git a/TAO/tao/Collocation_Proxy_Broker.cpp b/TAO/tao/Collocation_Proxy_Broker.cpp
new file mode 100644
index 00000000000..b1d780feccf
--- /dev/null
+++ b/TAO/tao/Collocation_Proxy_Broker.cpp
@@ -0,0 +1,13 @@
+// $Id$
+
+#include "Collocation_Proxy_Broker.h"
+
+
+ACE_RCSID (tao,
+           Collocation_Proxy_Broker,
+           "$Id$")
+
+
+TAO::Collocation_Proxy_Broker::~Collocation_Proxy_Broker (void)
+{
+}
diff --git a/TAO/tao/Collocation_Proxy_Broker.h b/TAO/tao/Collocation_Proxy_Broker.h
index 20c3db3dd93..df78412dc13 100644
--- a/TAO/tao/Collocation_Proxy_Broker.h
+++ b/TAO/tao/Collocation_Proxy_Broker.h
@@ -24,7 +24,10 @@
 
 #include "tao/TAO_Export.h"
 #include "tao/Collocation_Strategy.h"
-#include "tao/Pseudo_VarOut_T.h"
+
+
+template<typename T> class TAO_Pseudo_Var_T;
+template <typename T, typename T_var> class TAO_Pseudo_Out_T;
 
 namespace CORBA
 {
@@ -46,7 +49,7 @@ namespace TAO
 
   public:
 
-    virtual ~Collocation_Proxy_Broker (void) {}
+    virtual ~Collocation_Proxy_Broker (void);
 
     virtual Collocation_Strategy get_strategy (CORBA::Object_ptr obj
                                                ACE_ENV_ARG_DECL) = 0;
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index 4049c87ef31..0430f902c34 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -381,18 +381,24 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh)
 }
 
 int
+TAO_Connection_Handler::set_dscp_codepoint (CORBA::Boolean)
+{
+  return 0;
+}
+
+int
 TAO_Connection_Handler::release_os_resources (void)
 {
   return 0;
 }
 
 void
-TAO_Connection_Handler::pre_io_hook (int & )
+TAO_Connection_Handler::pre_io_hook (int &)
 {
 }
 
 void
-TAO_Connection_Handler::pos_io_hook (int & )
+TAO_Connection_Handler::pos_io_hook (int &)
 {
 }
 
diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl
index fd99783d293..fb86702c7d8 100644
--- a/TAO/tao/Connection_Handler.inl
+++ b/TAO/tao/Connection_Handler.inl
@@ -32,9 +32,3 @@ TAO_Connection_Handler::is_connecting (void) const
 {
   return this->state_ == TAO_LF_Event::LFS_CONNECTION_WAIT;
 }
-
-ACE_INLINE int
-TAO_Connection_Handler::set_dscp_codepoint (CORBA::Boolean)
-{
-  return 0;
-}
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp
index cc5fc953b2c..c38aadd4626 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// $Id$
 
 #include "tao/GIOP_Message_Generator_Parser.h"
 #include "tao/Pluggable_Messaging_Utils.h"
@@ -7,10 +7,16 @@
 #include "tao/CDR.h"
 #include "ace/Log_Msg.h"
 
+
 ACE_RCSID (tao,
            GIOP_Message_Gen_Parser,
            "$Id$")
 
+
+TAO_GIOP_Message_Generator_Parser::~TAO_GIOP_Message_Generator_Parser (void)
+{
+}
+
 int
 TAO_GIOP_Message_Generator_Parser::parse_reply (
     TAO_InputCDR &stream,
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h
index f4d05a7ec7e..a427384ea93 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser.h
@@ -46,7 +46,7 @@ class TAO_Export TAO_GIOP_Message_Generator_Parser
 {
 public:
 
-  virtual ~TAO_GIOP_Message_Generator_Parser (void) {}
+  virtual ~TAO_GIOP_Message_Generator_Parser (void);
 
   /// Write the request header in to @a msg
   virtual int write_request_header (
diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp
index 5220db65940..98ec2a02f51 100644
--- a/TAO/tao/Invocation_Adapter.cpp
+++ b/TAO/tao/Invocation_Adapter.cpp
@@ -23,6 +23,10 @@ ACE_RCSID (tao,
 
 namespace TAO
 {
+  Invocation_Adapter::~Invocation_Adapter (void)
+  {
+  }
+
   void
   Invocation_Adapter::invoke (TAO::Exception_Data *ex_data,
                               unsigned long ex_count
diff --git a/TAO/tao/Invocation_Adapter.inl b/TAO/tao/Invocation_Adapter.inl
index b0de6095f2b..9dff7a8f320 100644
--- a/TAO/tao/Invocation_Adapter.inl
+++ b/TAO/tao/Invocation_Adapter.inl
@@ -23,9 +23,4 @@ namespace TAO
     , mode_ (mode)
   {
   }
-
-  ACE_INLINE
-  Invocation_Adapter::~Invocation_Adapter (void)
-  {
-  }
 }
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 1c1984cb4e5..a2e4759c8db 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -81,6 +81,7 @@ libTAO_la_SOURCES = \
   Codeset_Manager.cpp \
   Codeset_Translator_Factory.cpp \
   Collocated_Invocation.cpp \
+  Collocation_Proxy_Broker.cpp \
   Collocation_Resolver.cpp \
   Connect_Strategy.cpp \
   Connection_Handler.cpp \
@@ -190,6 +191,7 @@ libTAO_la_SOURCES = \
   Messaging_SyncScopeC.cpp \
   Muxed_TMS.cpp \
   NVList.cpp \
+  New_Leader_Generator.cpp \
   ORB.cpp \
   ORBInitInfo.cpp \
   ORBInitInfoA.cpp \
@@ -1169,6 +1171,7 @@ libTAO_PortableServer_la_SOURCES = \
   PortableServer/ThreadStrategySingle.cpp \
   PortableServer/ThreadStrategySingleFactoryImpl.cpp \
   PortableServer/UB_String_SArguments.cpp \
+  PortableServer/Upcall_Command.cpp \
   PortableServer/Upcall_Wrapper.cpp
 
 libTAO_PortableServer_la_LDFLAGS = \
@@ -1640,7 +1643,6 @@ nobase_include_HEADERS += \
   Messaging/AMH_Response_Handler.h \
   Messaging/Asynch_Invocation.h \
   Messaging/Asynch_Invocation_Adapter.h \
-  Messaging/Asynch_Invocation_Adapter.inl \
   Messaging/Asynch_Reply_Dispatcher.h \
   Messaging/Asynch_Timeout_Handler.h \
   Messaging/Connection_Timeout_Policy_i.h \
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
index 52bcd0a134b..89b14a92d94 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
@@ -13,9 +13,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/Thread_Lane_Resources.h"
 
-#if !defined (__ACE_INLINE__)
-#include "Asynch_Invocation_Adapter.inl"
-#endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Messaging,
            Asynch_Invocation_Adapter,
@@ -24,13 +21,14 @@ ACE_RCSID (Messaging,
 
 namespace TAO
 {
-  Asynch_Invocation_Adapter::Asynch_Invocation_Adapter (CORBA::Object *target,
-                                                        Argument **args,
-                                                        int arg_number,
-                                                        const char *operation,
-                                                        int op_len,
-                                                        Collocation_Proxy_Broker *p,
-                                                        Invocation_Mode m)
+  Asynch_Invocation_Adapter::Asynch_Invocation_Adapter (
+    CORBA::Object *target,
+    Argument **args,
+    int arg_number,
+    const char *operation,
+    int op_len,
+    Collocation_Proxy_Broker *p,
+    Invocation_Mode m)
     : Invocation_Adapter (target,
                           args,
                           arg_number,
@@ -39,17 +37,17 @@ namespace TAO
                           p,
                           TAO_TWOWAY_INVOCATION,
                           m)
-      , safe_rd_ ()
+    , safe_rd_ ()
   {
   }
 
   void
   Asynch_Invocation_Adapter::invoke (
-      Messaging::ReplyHandler_ptr reply_handler_ptr,
-      const TAO_Reply_Handler_Skeleton &reply_handler_skel
-      ACE_ENV_ARG_DECL)
+    Messaging::ReplyHandler_ptr reply_handler_ptr,
+    const TAO_Reply_Handler_Skeleton &reply_handler_skel
+    ACE_ENV_ARG_DECL)
   {
-    TAO_Stub *stub =
+    TAO_Stub * stub =
       this->get_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
@@ -78,12 +76,14 @@ namespace TAO
         // If we have an allocator, use it, else use the heap.
         if (ami_allocator)
           {
-            ACE_NEW_MALLOC (rd,
-                            static_cast<TAO_Asynch_Reply_Dispatcher *> (ami_allocator->malloc (sizeof (TAO_Asynch_Reply_Dispatcher))),
-                            TAO_Asynch_Reply_Dispatcher (reply_handler_skel,
-                                                         reply_handler_ptr,
-                                                         stub->orb_core (),
-                                                         ami_allocator));
+            ACE_NEW_MALLOC (
+              rd,
+              static_cast<TAO_Asynch_Reply_Dispatcher *> (
+                ami_allocator->malloc (sizeof (TAO_Asynch_Reply_Dispatcher))),
+              TAO_Asynch_Reply_Dispatcher (reply_handler_skel,
+                                           reply_handler_ptr,
+                                           stub->orb_core (),
+                                           ami_allocator));
           }
         else
           {
@@ -102,22 +102,22 @@ namespace TAO
         this->safe_rd_.reset (rd);
       }
 
-    Invocation_Adapter::invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+    this->invoke (0, 0 ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
 
   Invocation_Status
   Asynch_Invocation_Adapter::invoke_twoway (
-      TAO_Operation_Details &op,
-      CORBA::Object_var &effective_target,
-      Profile_Transport_Resolver &r,
-      ACE_Time_Value *&max_wait_time
-      ACE_ENV_ARG_DECL)
+    TAO_Operation_Details &op,
+    CORBA::Object_var &effective_target,
+    Profile_Transport_Resolver &r,
+    ACE_Time_Value *&max_wait_time
+    ACE_ENV_ARG_DECL)
   {
     // Simple sanity check
-    if (this->mode_ != TAO_ASYNCHRONOUS_CALLBACK_INVOCATION ||
-        this->type_ != TAO_TWOWAY_INVOCATION)
+    if (this->mode_ != TAO_ASYNCHRONOUS_CALLBACK_INVOCATION
+        || this->type_ != TAO_TWOWAY_INVOCATION)
       {
         ACE_THROW_RETURN (CORBA::INTERNAL (
             CORBA::SystemException::_tao_minor_code (
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
index 43c9310ef76..8518b68d2c1 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
@@ -10,8 +10,10 @@
  *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
  */
 //=============================================================================
+
 #ifndef TAO_MESSAGING_ASYNCH_INVOCATION_ADAPTER_H
 #define TAO_MESSAGING_ASYNCH_INVOCATION_ADAPTER_H
+
 #include /**/ "ace/pre.h"
 
 #include "tao/Messaging/messaging_export.h"
@@ -53,7 +55,8 @@ namespace TAO
    * IDL compiler.
    *
    */
-  class TAO_Messaging_Export Asynch_Invocation_Adapter : public Invocation_Adapter
+  class TAO_Messaging_Export Asynch_Invocation_Adapter
+    : public Invocation_Adapter
   {
   public:
     Asynch_Invocation_Adapter (
@@ -69,9 +72,6 @@ namespace TAO
                  const TAO_Reply_Handler_Skeleton &reply_handler_skel
                  ACE_ENV_ARG_DECL);
 
-    virtual void invoke (TAO::Exception_Data *ex,
-                         unsigned long ex_count
-                         ACE_ENV_ARG_DECL);
   protected:
 
     /**
@@ -102,9 +102,6 @@ namespace TAO
 } // End namespace TAO
 
 
-#if defined (__ACE_INLINE__)
-#include "Asynch_Invocation_Adapter.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
+
 #endif /*TAO_MESSAGING_ASYNCH_INVOCATION_ADAPTER_H*/
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.inl b/TAO/tao/Messaging/Asynch_Invocation_Adapter.inl
deleted file mode 100644
index d13c62ae36e..00000000000
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.inl
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-
-namespace TAO
-{
-  ACE_INLINE void
-  Asynch_Invocation_Adapter::invoke (
-      TAO::Exception_Data *ex,
-      unsigned long ex_count
-      ACE_ENV_ARG_DECL)
-  {
-    Invocation_Adapter::invoke (ex, ex_count  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-} // End namespace TAO
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index 4da94e861da..e1b538883ac 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -292,6 +292,8 @@ Messaging__TAO_ReplyHandler_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_Messaging::_TAO_ReplyHandler_Direct_Proxy_Impl::_TAO_ReplyHandler_Direct_Proxy_Impl (void)
 {}
 
+POA_Messaging::_TAO_ReplyHandler_Direct_Proxy_Impl::~_TAO_ReplyHandler_Direct_Proxy_Impl (void)
+{}
 
 
 //
diff --git a/TAO/tao/Messaging/MessagingS.h b/TAO/tao/Messaging/MessagingS.h
index 83c5aadc098..214ed9a5f9b 100644
--- a/TAO/tao/Messaging/MessagingS.h
+++ b/TAO/tao/Messaging/MessagingS.h
@@ -188,7 +188,7 @@ namespace POA_Messaging
   public:
     _TAO_ReplyHandler_Direct_Proxy_Impl (void);
     
-    virtual ~_TAO_ReplyHandler_Direct_Proxy_Impl (void) {}
+    virtual ~_TAO_ReplyHandler_Direct_Proxy_Impl (void);
   };
   
   //
diff --git a/TAO/tao/New_Leader_Generator.cpp b/TAO/tao/New_Leader_Generator.cpp
new file mode 100644
index 00000000000..3139d42ad27
--- /dev/null
+++ b/TAO/tao/New_Leader_Generator.cpp
@@ -0,0 +1,13 @@
+// $Id$
+
+#include "New_Leader_Generator.h"
+
+
+ACE_RCSID (tao,
+           New_Leader_Generator,
+           "$Id$")
+
+
+TAO_New_Leader_Generator::~TAO_New_Leader_Generator (void)
+{
+}
diff --git a/TAO/tao/New_Leader_Generator.h b/TAO/tao/New_Leader_Generator.h
index 6c1f292d6f1..17d4dd6cae1 100644
--- a/TAO/tao/New_Leader_Generator.h
+++ b/TAO/tao/New_Leader_Generator.h
@@ -14,6 +14,8 @@
 #define TAO_NEW_LEADER_GENERATOR_H
 
 #include /**/ "ace/pre.h"
+
+#include "tao/TAO_Export.h"
 #include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -21,7 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 /**
- * @class TAO_RT_New_Leader_Generator
+ * @class TAO_New_Leader_Generator
  *
  * @brief Class for creating dynamic threads.
  *
@@ -33,7 +35,7 @@ class TAO_Export TAO_New_Leader_Generator
 public:
 
   /// Destructor.
-  virtual ~TAO_New_Leader_Generator (void) {}
+  virtual ~TAO_New_Leader_Generator (void);
 
   /// Leader/Follower class uses this method to notify the system that
   /// we are out of leaders.
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 85d898638e1..25a3350838d 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -157,6 +157,13 @@ CORBA::Object::_tao_any_destructor (void *x)
   CORBA::release (tmp);
 }
 
+// virtual -- do not inline
+CORBA::Boolean
+CORBA::Object::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 /*static*/ CORBA::Boolean
 CORBA::Object::marshal (CORBA::Object_ptr x,
                         TAO_OutputCDR &cdr)
@@ -237,6 +244,12 @@ CORBA::Object::_is_local (void) const
 }
 
 TAO_Stub *
+CORBA::Object::_stubobj (void) const
+{
+  return this->protocol_proxy_;
+}
+
+TAO_Stub *
 CORBA::Object::_stubobj (void)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
index fdcf9939609..d65de4e3bc9 100644
--- a/TAO/tao/Object.i
+++ b/TAO/tao/Object.i
@@ -74,20 +74,6 @@ CORBA::Object::_narrow (CORBA::Object_ptr obj
   return CORBA::Object::_duplicate (obj);
 }
 
-ACE_INLINE
-TAO_Stub *
-CORBA::Object::_stubobj (void) const
-{
-  return this->protocol_proxy_;
-}
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::Object::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 ACE_INLINE CORBA::Boolean
 CORBA::Object::is_evaluated (void) const
 {
diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp
index 59280a5c800..383c7a44db9 100644
--- a/TAO/tao/Policy_Manager.cpp
+++ b/TAO/tao/Policy_Manager.cpp
@@ -13,4 +13,25 @@ ACE_RCSID (tao,
            Policy_Manager,
            "$Id$")
 
+
+CORBA::PolicyList *
+TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts
+                                          ACE_ENV_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
+  return this->impl_.get_policy_overrides (ts ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_Policy_Manager::set_policy_overrides (const CORBA::PolicyList & policies,
+                                          CORBA::SetOverrideType set_add
+                                          ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   CORBA::InvalidPolicies))
+{
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
+  this->impl_.set_policy_overrides (policies, set_add ACE_ENV_ARG_PARAMETER);
+}
+
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i
index 3882443c3c8..32eb06bdff8 100644
--- a/TAO/tao/Policy_Manager.i
+++ b/TAO/tao/Policy_Manager.i
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+//
 // $Id$
 
 ACE_INLINE
@@ -15,26 +17,6 @@ TAO_Policy_Manager::get_policy (
   return this->impl_.get_policy (policy ACE_ENV_ARG_PARAMETER);
 }
 
-ACE_INLINE CORBA::PolicyList *
-TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts
-                                          ACE_ENV_ARG_DECL)
-     ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
-  return this->impl_.get_policy_overrides (ts ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE void
-TAO_Policy_Manager::set_policy_overrides (const CORBA::PolicyList & policies,
-                                          CORBA::SetOverrideType set_add
-                                          ACE_ENV_ARG_DECL)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      CORBA::InvalidPolicies))
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
-  this->impl_.set_policy_overrides (policies, set_add ACE_ENV_ARG_PARAMETER);
-}
-
 ACE_INLINE CORBA::Policy_ptr
 TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type
                                        ACE_ENV_ARG_DECL)
@@ -50,4 +32,3 @@ TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type
   return this->impl_.get_cached_policy (type
                                         ACE_ENV_ARG_PARAMETER);
 }
-
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index c10a16fefa7..5f07633ff5c 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -334,6 +334,9 @@ CORBA__TAO_Policy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_TAO_Policy_Direct_Proxy_Impl (void)
 {}
 
+POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::~_TAO_Policy_Direct_Proxy_Impl (void)
+{}
+
 // TAO_IDL - Generated from 
 // be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index a329243c0a0..8a337b60d65 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -247,7 +247,7 @@ namespace POA_CORBA
   public:
     _TAO_Policy_Direct_Proxy_Impl (void);
 
-    virtual ~_TAO_Policy_Direct_Proxy_Impl (void) {}
+    virtual ~_TAO_Policy_Direct_Proxy_Impl (void);
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
diff --git a/TAO/tao/PortableServer/Upcall_Command.cpp b/TAO/tao/PortableServer/Upcall_Command.cpp
new file mode 100644
index 00000000000..ebfa73dac9b
--- /dev/null
+++ b/TAO/tao/PortableServer/Upcall_Command.cpp
@@ -0,0 +1,13 @@
+// $Id$
+
+#include "Upcall_Command.h"
+
+
+ACE_RCSID (PortableServer,
+           Upcall_Command,
+           "$Id$")
+
+
+TAO::Upcall_Command::~Upcall_Command (void)
+{
+}
diff --git a/TAO/tao/PortableServer/Upcall_Command.h b/TAO/tao/PortableServer/Upcall_Command.h
index 5e3690e1344..700ad64090c 100644
--- a/TAO/tao/PortableServer/Upcall_Command.h
+++ b/TAO/tao/PortableServer/Upcall_Command.h
@@ -15,12 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
+#include "tao/PortableServer/portableserver_export.h"
 #include "ace/CORBA_macros.h"
 
 #ifndef ACE_LACKS_PRAGMA_ONCE
 # pragma once
 #endif /* !ACE_LACKS_PRAGMA_ONCE */
 
+
 namespace CORBA
 {
   class Environment;
@@ -41,12 +43,12 @@ namespace TAO
    * @c send_exception() interception point must be invoked when the
    * servant operation throws an exception.
    */
-  class Upcall_Command
+  class TAO_PortableServer_Export Upcall_Command
   {
   public:
 
     /// Destructor.
-    virtual ~Upcall_Command (void) {}
+    virtual ~Upcall_Command (void);
 
     /// Execute the upcall.
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL) = 0;
diff --git a/TAO/tao/Queued_Message.cpp b/TAO/tao/Queued_Message.cpp
index f303a112fce..00759385def 100644
--- a/TAO/tao/Queued_Message.cpp
+++ b/TAO/tao/Queued_Message.cpp
@@ -24,6 +24,18 @@ TAO_Queued_Message::~TAO_Queued_Message (void)
 {
 }
 
+TAO_Queued_Message *
+TAO_Queued_Message::next (void) const
+{
+  return this->next_;
+}
+
+TAO_Queued_Message *
+TAO_Queued_Message::prev (void) const
+{
+  return this->prev_;
+}
+
 void
 TAO_Queued_Message::remove_from_list (TAO_Queued_Message *&head,
                                       TAO_Queued_Message *&tail)
diff --git a/TAO/tao/Queued_Message.inl b/TAO/tao/Queued_Message.inl
index b4f6734aa71..2ad999ebb73 100644
--- a/TAO/tao/Queued_Message.inl
+++ b/TAO/tao/Queued_Message.inl
@@ -1,14 +1,3 @@
 // -*- C++ -*-
+//
 // $Id$
-
-ACE_INLINE TAO_Queued_Message *
-TAO_Queued_Message::next (void) const
-{
-  return this->next_;
-}
-
-ACE_INLINE TAO_Queued_Message *
-TAO_Queued_Message::prev (void) const
-{
-  return this->prev_;
-}
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index 1b037fc1882..5b8d085fef6 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -213,6 +213,12 @@ CORBA::SystemException::_tao_errno (int errno_value)
     }
 }
 
+CORBA::Exception *
+CORBA::SystemException::_tao_duplicate (void) const
+{
+  return 0;
+}
+
 CORBA::ULong
 CORBA::SystemException::_tao_minor_code (u_int location,
                                          int errno_value)
diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h
index 241bb3d8c89..cb34d66a6fb 100644
--- a/TAO/tao/SystemException.h
+++ b/TAO/tao/SystemException.h
@@ -136,8 +136,8 @@ namespace CORBA
     static CORBA::ULong _tao_errno (int errno_value);
 
     /// Overridden base class method to help compilers that use
-    /// explicit template instantiations going
-    virtual CORBA::Exception *_tao_duplicate (void) const {return 0;}
+    /// explicit template instantiations get going.
+    virtual CORBA::Exception *_tao_duplicate (void) const;
 
   protected:
 
diff --git a/TAO/tao/UTF16_BOM_Translator.cpp b/TAO/tao/UTF16_BOM_Translator.cpp
index 69cd26bf188..287430f5c06 100644
--- a/TAO/tao/UTF16_BOM_Translator.cpp
+++ b/TAO/tao/UTF16_BOM_Translator.cpp
@@ -385,6 +385,18 @@ UTF16_BOM_Translator::write_wchar_array (ACE_OutputCDR & cdr,
   return this->write_wchar_array_i (cdr, x, length);
 }
 
+ACE_CDR::ULong
+UTF16_BOM_Translator::ncs (void)
+{
+  return 0x00010109;
+}
+
+ACE_CDR::ULong
+UTF16_BOM_Translator::tcs (void)
+{
+  return 0x00010109;
+}
+
 ACE_CDR::Boolean
 UTF16_BOM_Translator::write_wchar_array_i (ACE_OutputCDR & cdr,
                                            const ACE_CDR::WChar *x,
diff --git a/TAO/tao/UTF16_BOM_Translator.h b/TAO/tao/UTF16_BOM_Translator.h
index 9a6e534cd9a..11338846dae 100644
--- a/TAO/tao/UTF16_BOM_Translator.h
+++ b/TAO/tao/UTF16_BOM_Translator.h
@@ -62,8 +62,8 @@ public:
   virtual ACE_CDR::Boolean write_wchar_array (ACE_OutputCDR &,
                                              const ACE_CDR::WChar *,
                                              ACE_CDR::ULong);
-  virtual ACE_CDR::ULong ncs () {return 0x00010109;}
-  virtual ACE_CDR::ULong tcs () {return 0x00010109;}
+  virtual ACE_CDR::ULong ncs (void);
+  virtual ACE_CDR::ULong tcs (void);
 
 private:
   ACE_CDR::Boolean read_wchar_array_i (ACE_InputCDR &,
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 8305c999460..a0722476e0e 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -51,6 +51,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Codeset_Manager.cpp
     Codeset_Translator_Factory.cpp
     Collocated_Invocation.cpp
+    Collocation_Proxy_Broker.cpp
     Collocation_Resolver.cpp
     Connect_Strategy.cpp
     Connection_Handler.cpp
@@ -167,6 +168,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     MProfile.cpp
     Muxed_TMS.cpp
     NVList.cpp
+    New_Leader_Generator.cpp
     Object.cpp
     Object_KeyC.cpp
     Object_Loader.cpp