ChangeLogTag:Thu Nov 3 09:26:21 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

32 files changed, 139 insertions, 17 deletions

diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp
index 58117d9903c..b78a8a21746 100644
--- a/TAO/tao/PI/ClientRequestInfo.cpp
+++ b/TAO/tao/PI/ClientRequestInfo.cpp
@@ -4,7 +4,7 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-ACE_RCSID (tao,
+ACE_RCSID (PI,
            ClientRequestInfo,
            "$Id$")
 
@@ -24,6 +24,8 @@ ACE_RCSID (tao,
 #include "tao/Service_Context.h"
 #include "tao/Exception_Data.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ClientRequestInfo::TAO_ClientRequestInfo (TAO::Invocation_Base *inv)
   : invocation_ (inv),
     rs_pi_current_ (),
@@ -746,4 +748,6 @@ TAO_ClientRequestInfo::tao_ft_retention_id (void) const
   return this->invocation_->operation_details ().ft_retention_id ();
 }
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h
index e25052b7d67..3508967140b 100644
--- a/TAO/tao/PI/ClientRequestInfo.h
+++ b/TAO/tao/PI/ClientRequestInfo.h
@@ -41,6 +41,7 @@
 #include "tao/Invocation_Utils.h"
 #include "tao/TimeBaseC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Service_Context;
 
@@ -68,7 +69,7 @@ namespace Messaging
  * @brief Implementation of the PortableInterceptor::ClientRequestInfo
  *        interface.
  */
-class TAO_PI_Export TAO_ClientRequestInfo
+class TAO_ClientRequestInfo
   : public virtual PortableInterceptor::ClientRequestInfo,
     public virtual TAO_Local_RefCounted_Object
 {
@@ -290,6 +291,8 @@ private:
   TAO::PICurrent_Copy_Callback copy_callback_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
index 574fc987085..3c05b186fcf 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
@@ -17,6 +17,8 @@ ACE_RCSID (PI,
            ClientRequestInterceptorAdapter_Impl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   void
@@ -266,4 +268,6 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
index 2ec52a987aa..f76c07b3a55 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
@@ -34,6 +34,7 @@
 #include "ClientRequestInterceptorC.h"
 #include "tao/ClientRequestInterceptor_Adapter.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -120,6 +121,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ClientRequestInterceptor_Adapter_Impl.inl"
 #endif  /* __ACE_INLINE__ */
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl
index e234f5d02ac..c1c7835148d 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   ACE_INLINE
@@ -9,3 +11,5 @@ namespace TAO
   {
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
index 890ce995534..4a6aee7b43d 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 // =================================================================
 /**
@@ -24,6 +24,8 @@ ACE_RCSID (PI,
            ClientRequestInterceptor_Factory_Impl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::ClientRequestInterceptor_Adapter*
 TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create (void)
 {
@@ -34,6 +36,8 @@ TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create (void)
   return obj;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_ClientRequestInterceptor_Adapter_Factory_Impl,
                        ACE_TEXT ("ClientRequestInterceptor_Adapter_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h
index c3b959f156f..95985693ff8 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h
+++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,8 +26,10 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "ace/Service_Config.h"
 #include "tao/ClientRequestInterceptor_Adapter_Factory.h"
+#include "ace/Service_Config.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -42,6 +43,8 @@ public:
   virtual TAO::ClientRequestInterceptor_Adapter *create (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_ClientRequestInterceptor_Adapter_Factory_Impl)
 ACE_FACTORY_DECLARE (TAO_PI, TAO_ClientRequestInterceptor_Adapter_Factory_Impl)
 
diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp
index 5f3b6e74581..bbb53171661 100644
--- a/TAO/tao/PI/Interceptor_List_T.cpp
+++ b/TAO/tao/PI/Interceptor_List_T.cpp
@@ -10,6 +10,8 @@
 #include "ace/OS_NS_string.h"
 #include "ace/Log_Msg.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   template <typename InterceptorType>
@@ -147,3 +149,5 @@ namespace TAO
     ACE_CHECK;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h
index bb3a29db0a8..c6f11f4d75b 100644
--- a/TAO/tao/PI/Interceptor_List_T.h
+++ b/TAO/tao/PI/Interceptor_List_T.h
@@ -24,6 +24,8 @@
 
 #include "tao/SystemException.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableInterceptor
 {
   class Interceptor;
@@ -70,6 +72,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Interceptor_List_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp
index 658f11d6238..4819da4e5c6 100644
--- a/TAO/tao/PI/ORBInitInfo.cpp
+++ b/TAO/tao/PI/ORBInitInfo.cpp
@@ -24,6 +24,8 @@ ACE_RCSID (TAO,
 
 #include "ace/OS_NS_string.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Traits specializations for TAO_ORBInitInfo.
 
 TAO_ORBInitInfo_ptr
@@ -383,3 +385,4 @@ const char* TAO_ORBInitInfo::_interface_repository_id (void) const
   return "IDL:TAO_ORBInitInfo:1.0";
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h
index f83238f0305..0598088c330 100644
--- a/TAO/tao/PI/ORBInitInfo.h
+++ b/TAO/tao/PI/ORBInitInfo.h
@@ -35,6 +35,8 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 class TAO_ORBInitInfo;
 typedef TAO_ORBInitInfo *TAO_ORBInitInfo_ptr;
@@ -293,6 +295,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ORBInitInfo.inl"
 #endif  /* __ACE_INLINE__ */
diff --git a/TAO/tao/PI/ORBInitInfo.inl b/TAO/tao/PI/ORBInitInfo.inl
index bb8d32ed135..f151fd2711d 100644
--- a/TAO/tao/PI/ORBInitInfo.inl
+++ b/TAO/tao/PI/ORBInitInfo.inl
@@ -3,6 +3,8 @@
 // $Id$
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO_ORB_Core *
 TAO_ORBInitInfo::orb_core (void) const
 {
@@ -20,3 +22,5 @@ TAO_ORBInitInfo::slot_count (void) const
 {
   return this->slot_count_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
index 55efc3a28a9..f55ab7055a1 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -14,6 +14,9 @@ ACE_RCSID (PI,
            ORBInitializer_Registry,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::ORBInitializer_Registry::ORBInitializer_Registry (void)
   : lock_ (),
     initializers_ ()
@@ -178,6 +181,8 @@ TAO::ORBInitializer_Registry::post_init (
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (ORBInitializer_Registry,
                        ACE_TEXT ("ORBInitializer_Registry"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
index 66464bf77d8..188408562e5 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
@@ -31,6 +31,8 @@
 #include "ace/Service_Config.h"
 #include "ace/Recursive_Thread_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -39,7 +41,7 @@ namespace TAO
    * @brief Global list that contains all portable interceptor ORB
    *        initializers.
    */
-  class TAO_PI_Export ORBInitializer_Registry
+  class ORBInitializer_Registry
     : public ORBInitializer_Registry_Adapter
   {
     public:
@@ -87,6 +89,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (ORBInitializer_Registry)
 ACE_FACTORY_DECLARE (TAO_PI, ORBInitializer_Registry)
 
diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp
index 3088ad074b6..1d4592cc6ca 100644
--- a/TAO/tao/PI/PI.cpp
+++ b/TAO/tao/PI/PI.cpp
@@ -8,6 +8,8 @@ ACE_RCSID (PI,
            PI,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_PI_Init::Initializer (void)
 {
@@ -20,3 +22,4 @@ TAO_PI_Init::Initializer (void)
   return ACE_Service_Config::process_directive (ace_svc_desc_ORBInitializer_Registry);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PI.h b/TAO/tao/PI/PI.h
index d1849e3c781..514bde89974 100644
--- a/TAO/tao/PI/PI.h
+++ b/TAO/tao/PI/PI.h
@@ -21,6 +21,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_PI_Init
  *
@@ -37,6 +41,8 @@ static int
 TAO_Requires_PI_Initializer =
   TAO_PI_Init::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #define TAO_PI_SAFE_INCLUDE
diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp
index dc3bf53884a..4ef4820f623 100644
--- a/TAO/tao/PI/PICurrent.cpp
+++ b/TAO/tao/PI/PICurrent.cpp
@@ -18,6 +18,7 @@ ACE_RCSID (tao,
 #include "tao/TAO_Server_Request.h"
 #include "tao/SystemException.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::PICurrent::PICurrent (TAO_ORB_Core &orb_core)
   : orb_core_ (orb_core),
@@ -120,5 +121,6 @@ TAO::PICurrent::initialize (PortableInterceptor::SlotId sc
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h
index 3c52b628bae..c0354474538 100644
--- a/TAO/tao/PI/PICurrent.h
+++ b/TAO/tao/PI/PICurrent.h
@@ -35,6 +35,8 @@
 # pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Forward declarations.
 class TAO_ORB_Core;
 
@@ -134,6 +136,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "PICurrent.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PI/PICurrent.inl b/TAO/tao/PI/PICurrent.inl
index 7fd7fc77b1b..aca42f2786c 100644
--- a/TAO/tao/PI/PICurrent.inl
+++ b/TAO/tao/PI/PICurrent.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE PortableInterceptor::SlotId
 TAO::PICurrent::slot_count (void) const
@@ -9,3 +10,4 @@ TAO::PICurrent::slot_count (void) const
   return this->slot_count_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PICurrent_Copy_Callback.cpp b/TAO/tao/PI/PICurrent_Copy_Callback.cpp
index 7ad09ada95b..10cdea0a1d0 100644
--- a/TAO/tao/PI/PICurrent_Copy_Callback.cpp
+++ b/TAO/tao/PI/PICurrent_Copy_Callback.cpp
@@ -9,6 +9,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::PICurrent_Copy_Callback::PICurrent_Copy_Callback (void)
   : src_ (0),
     dst_ (0)
@@ -56,4 +58,6 @@ TAO::PICurrent_Copy_Callback::src_and_dst (PICurrent_Impl * src,
   this->dst_ = dst;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI/PICurrent_Copy_Callback.h b/TAO/tao/PI/PICurrent_Copy_Callback.h
index 5b5f17d4505..b1e7678d990 100644
--- a/TAO/tao/PI/PICurrent_Copy_Callback.h
+++ b/TAO/tao/PI/PICurrent_Copy_Callback.h
@@ -25,6 +25,9 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   class PICurrent_Impl;
@@ -65,6 +68,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PI/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp
index ecbccc90274..ae083b7eb2f 100644
--- a/TAO/tao/PI/PICurrent_Impl.cpp
+++ b/TAO/tao/PI/PICurrent_Impl.cpp
@@ -17,6 +17,9 @@ ACE_RCSID (tao,
 #include "tao/SystemException.h"
 #include "ace/Log_Msg.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::PICurrent_Impl::PICurrent_Impl (void)
   : slot_table_ (),
     lc_slot_table_ (0),
@@ -112,4 +115,6 @@ TAO::PICurrent_Impl::execute_destruction_callback (
   this->lc_slot_table_ = old_lc_slot_table;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h
index d374f174e4b..92646834256 100644
--- a/TAO/tao/PI/PICurrent_Impl.h
+++ b/TAO/tao/PI/PICurrent_Impl.h
@@ -30,6 +30,8 @@
 #include "ace/Array_Base.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Forward declarations.
 class TAO_ORB_Core;
 
@@ -135,6 +137,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "PICurrent_Impl.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PI/PICurrent_Impl.inl b/TAO/tao/PI/PICurrent_Impl.inl
index 8b708ec7f5a..67d5132e4f9 100644
--- a/TAO/tao/PI/PICurrent_Impl.inl
+++ b/TAO/tao/PI/PICurrent_Impl.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void
 TAO::PICurrent_Impl::copy_callback (TAO::PICurrent_Copy_Callback *cb)
 {
@@ -53,3 +55,5 @@ TAO::PICurrent_Impl::lc_slot_table (void) const
 {
   return this->lc_slot_table_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PICurrent_Loader.cpp b/TAO/tao/PI/PICurrent_Loader.cpp
index 1423cd7c663..e0c38011bf1 100644
--- a/TAO/tao/PI/PICurrent_Loader.cpp
+++ b/TAO/tao/PI/PICurrent_Loader.cpp
@@ -25,6 +25,8 @@ ACE_RCSID (PI,
            PICurrent_Loader,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Object_ptr
 TAO_PICurrent_Loader::create_object (
   CORBA::ORB_ptr orb,
@@ -40,6 +42,8 @@ TAO_PICurrent_Loader::create_object (
   return obj;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_PICurrent_Loader,
                        ACE_TEXT ("PICurrent_Loader"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/PI/PICurrent_Loader.h b/TAO/tao/PI/PICurrent_Loader.h
index 931d2216082..3cac77a3754 100644
--- a/TAO/tao/PI/PICurrent_Loader.h
+++ b/TAO/tao/PI/PICurrent_Loader.h
@@ -31,6 +31,8 @@
 
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_PI_Export TAO_PICurrent_Loader
   : public TAO_Object_Loader
 {
@@ -43,6 +45,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_PICurrent_Loader)
 ACE_FACTORY_DECLARE (TAO_PI, TAO_PICurrent_Loader)
 
diff --git a/TAO/tao/PI/PolicyFactory_Loader.cpp b/TAO/tao/PI/PolicyFactory_Loader.cpp
index bea75ef3a0f..cdf999d5dcf 100644
--- a/TAO/tao/PI/PolicyFactory_Loader.cpp
+++ b/TAO/tao/PI/PolicyFactory_Loader.cpp
@@ -21,6 +21,8 @@ ACE_RCSID (PI,
            PolicyFactory_Loader,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::PolicyFactory_Registry_Adapter*
 TAO_PolicyFactory_Loader::create (void)
 {
@@ -37,6 +39,8 @@ TAO_PolicyFactory_Loader::Initializer (void)
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_PolicyFactory_Loader);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_PolicyFactory_Loader,
                        ACE_TEXT ("PolicyFactory_Loader"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/PI/PolicyFactory_Loader.h b/TAO/tao/PI/PolicyFactory_Loader.h
index 10b0280f4d9..45b6792a09a 100644
--- a/TAO/tao/PI/PolicyFactory_Loader.h
+++ b/TAO/tao/PI/PolicyFactory_Loader.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 
 //=============================================================================
@@ -26,6 +26,8 @@
 #include "tao/PolicyFactory_Registry_Factory.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_PI_Export TAO_PolicyFactory_Loader
   : public TAO_PolicyFactory_Registry_Factory
 {
@@ -37,12 +39,14 @@ public:
   static int Initializer (void);
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_PolicyFactory_Loader)
-ACE_FACTORY_DECLARE (TAO_PI, TAO_PolicyFactory_Loader)
-
 static int
 TAO_Requires_PolicyFactory_Initializer = TAO_PolicyFactory_Loader::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_PolicyFactory_Loader)
+ACE_FACTORY_DECLARE (TAO_PI, TAO_PolicyFactory_Loader)
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_POLICYFACTORY_LOADER_H */
diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp
index 7999bbecc3c..bf3b3ea65ac 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PI/PolicyFactory_Registry.cpp
@@ -11,6 +11,8 @@ ACE_RCSID (PI,
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry (void)
   : factories_ (TAO_DEFAULT_POLICY_FACTORY_REGISTRY_SIZE)
 {
@@ -117,3 +119,5 @@ TAO_PolicyFactory_Registry::factory_exists (CORBA::PolicyType & type) const
   return (this->factories_.find (type) == 0);
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PolicyFactory_Registry.h b/TAO/tao/PI/PolicyFactory_Registry.h
index 05a5747d112..882f386c70c 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.h
+++ b/TAO/tao/PI/PolicyFactory_Registry.h
@@ -16,17 +16,19 @@
 
 #include /**/ "ace/pre.h"
 
-#include "pi_export.h"
+#include "tao/Basic_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Basic_Types.h"
+#include "tao/PolicyFactory_Registry_Adapter.h"
 #include "ace/Map_Manager.h"
 #include "ace/Null_Mutex.h"
 #include "ace/CORBA_macros.h"
-#include "tao/Basic_Types.h"
-#include "tao/PolicyFactory_Registry_Adapter.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_PolicyFactory_Registry
@@ -36,7 +38,7 @@
  * ORB-specific registry that contains all portable interceptor
  * policy factories.
  */
-class TAO_PI_Export TAO_PolicyFactory_Registry
+class TAO_PolicyFactory_Registry
   : public TAO::PolicyFactory_Registry_Adapter
 {
 public:
@@ -93,6 +95,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_POLICY_FACTORY_REGISTRY_H */
diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp
index 191a30e51c4..fc92d156262 100644
--- a/TAO/tao/PI/RequestInfo_Util.cpp
+++ b/TAO/tao/PI/RequestInfo_Util.cpp
@@ -16,6 +16,7 @@ ACE_RCSID (tao,
            RequestInfo_Util,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 Dynamic::ParameterList *
 TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL)
@@ -97,15 +98,16 @@ TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any
                         0,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
+  ACE_CHECK_RETURN (any);
 
   if (tk_void_any)
     {
       any->_tao_set_typecode (CORBA::_tc_void);
     }
 
-  // No need to do an ACE_CHECK_RETURN.  The caller should do that.
-
   return any;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/tao/PI/RequestInfo_Util.h b/TAO/tao/PI/RequestInfo_Util.h
index f32b1d8dc2f..6cb834ea586 100644
--- a/TAO/tao/PI/RequestInfo_Util.h
+++ b/TAO/tao/PI/RequestInfo_Util.h
@@ -28,6 +28,8 @@
 #include "ace/CORBA_macros.h"
 #include "pi_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class StringSeq;
@@ -80,6 +82,8 @@ public:
   //@}
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
 
 #include /**/ "ace/post.h"