ChangeLogTag:Wed Nov 9 22:34:24 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

41 files changed, 218 insertions, 172 deletions

diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
index 11daa44e90d..6114de4f75b 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-//
 // $Id$
 
 #include "FT_ClientORBInitializer.h"
@@ -13,13 +11,14 @@ ACE_RCSID (FaultTolerance,
            FT_ClientORBInitializer,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO_FT_ClientORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-
 }
 
 void
@@ -112,3 +111,5 @@ TAO_FT_ClientORBInitializer::register_client_request_interceptors (
                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
index d5fd561e3ad..0537577a9c8 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
@@ -30,10 +30,12 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// FT ORB initializer.
-class TAO_FT_ClientORB_Export TAO_FT_ClientORBInitializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+class TAO_FT_ClientORBInitializer
+  : public virtual PortableInterceptor::ORBInitializer
+  , public virtual TAO_Local_RefCounted_Object
 {
 public:
 
@@ -60,6 +62,8 @@ private:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
index 5a1b5dd4e2d..3b1d573830a 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-//
 // $Id$
 
 #include "FT_ClientPolicyFactory.h"
@@ -11,6 +9,7 @@ ACE_RCSID (FaultTolerance,
            FT_ClientPolicyFactory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy_ptr
 TAO_FT_ClientPolicyFactory::create_policy (
@@ -31,3 +30,5 @@ TAO_FT_ClientPolicyFactory::create_policy (
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
index 6d05145d5fc..72433ffab41 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
@@ -33,10 +33,12 @@
 
 #include "FT_ClientORB_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Policy factory for all FTCORBA related policies.
-class TAO_FT_ClientORB_Export TAO_FT_ClientPolicyFactory :
-  public PortableInterceptor::PolicyFactory,
-  public TAO_Local_RefCounted_Object
+class TAO_FT_ClientPolicyFactory
+  : public PortableInterceptor::PolicyFactory
+  , public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -47,6 +49,8 @@ public:
                      CORBA::PolicyError));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
index 2acb4be7939..20a229a0ccf 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
@@ -12,6 +12,8 @@
 
 ACE_RCSID(FaultTolerance, FT_ClientPolicy_i, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TimeBase::TimeT
 TAO_FT_Request_Duration_Policy::request_duration_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -188,3 +190,4 @@ TAO_FT_Heart_Beat_Policy::set_time_value (ACE_Time_Value &time_value,
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
index 02e9ac09308..2dd5abc2e23 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   FT_ClientPolicy_i.h
@@ -24,6 +25,8 @@
 #include "tao/LocalObject.h"
 #include "FT_ClientORB_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_FT_Request_Duration_Policy
  *
@@ -39,7 +42,7 @@
  * to keep trying to connect to server object groups under certain
  * conditions.
  */
-class TAO_FT_ClientORB_Export TAO_FT_Request_Duration_Policy
+class TAO_FT_Request_Duration_Policy
   : public FT::RequestDurationPolicy,
     public TAO_Local_RefCounted_Object
 {
@@ -92,7 +95,7 @@ private:
  * If this  policy is set, it enables the client ORB to send
  * heartbeats to the server ORB over the open connections.
  */
-class TAO_FT_ClientORB_Export TAO_FT_Heart_Beat_Policy
+class TAO_FT_Heart_Beat_Policy
   : public FT::HeartbeatPolicy,
     public TAO_Local_RefCounted_Object
 {
@@ -147,6 +150,8 @@ private:
   TimeBase::TimeT heartbeat_timeout_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
index 7b63b76de72..7644c34c231 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
@@ -1,4 +1,9 @@
+// -*- C++ -*-
+//
 //$Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (
     const TimeBase::TimeT &duration
@@ -47,4 +52,4 @@ TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy (
 {
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index f914c45ae99..351277b62f9 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -20,6 +20,8 @@ ACE_RCSID (FaultTolerance,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   FT_ClientRequest_Interceptor::FT_ClientRequest_Interceptor (void)
@@ -435,3 +437,5 @@ namespace TAO
     return t;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
index 67dff801d64..054d9a98ed5 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file     FT_ClientRequest_Interceptor.h
@@ -37,6 +38,8 @@ namespace ACE_Utils
   class UUID;
 }
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -63,7 +66,7 @@ namespace TAO
    *
    *  @@TODO
    */
-  class TAO_FT_ClientORB_Export FT_ClientRequest_Interceptor
+  class FT_ClientRequest_Interceptor
     : public virtual PortableInterceptor::ClientRequestInterceptor,
       public virtual TAO_Local_RefCounted_Object
   {
@@ -71,8 +74,6 @@ namespace TAO
 
     FT_ClientRequest_Interceptor (void);
 
-    ~FT_ClientRequest_Interceptor (void);
-
     /// Canonical name of the interceptor.
     virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
@@ -104,6 +105,10 @@ namespace TAO
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
+  protected:
+
+    ~FT_ClientRequest_Interceptor (void);
+
   private:
 
     void group_version_context (PortableInterceptor::ClientRequestInfo_ptr ri
@@ -133,6 +138,9 @@ namespace TAO
     CORBA::Long retention_id_;
   };
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
index 4dc19d2f66a..fd70ea58531 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
@@ -11,6 +11,8 @@ ACE_RCSID(FaultTolerance, FT_ClientService_Activate, "$Id$")
 
 static bool initialized = false;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_FT_ClientService_Activate::TAO_FT_ClientService_Activate (void)
 {
 }
@@ -67,6 +69,8 @@ TAO_FT_ClientService_Activate::Initializer (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_FT_ClientORB,TAO_FT_ClientService_Activate)
 
 ACE_STATIC_SVC_DEFINE (TAO_FT_ClientService_Activate,
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
index feb04749ae6..9aa5e0d7889 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  * @file FT_ClientService_Activate.h
@@ -23,6 +25,8 @@
 #include "tao/Services_Activate.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Service_Callbacks;
 
 // Forward declarations
@@ -55,14 +59,15 @@ public:
 
   /// Used to force the initialization.
   static int Initializer (void);
-
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_FT_ClientService_Activate)
-ACE_FACTORY_DECLARE (TAO_FT_ClientORB, TAO_FT_ClientService_Activate)
-
 static int
 TAO_FT_Requires_ClientService_Activate = TAO_FT_ClientService_Activate::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_FT_ClientService_Activate)
+ACE_FACTORY_DECLARE (TAO_FT_ClientORB, TAO_FT_ClientService_Activate)
+
 #include /**/ "ace/post.h"
 #endif /*TAO_FT_CLIENTACTIVATE_H*/
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
index bd37bc897c2..adfc55d3e05 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
@@ -10,16 +10,16 @@ ACE_RCSID (FaultTolerance,
            FT_Endpoint_Selector_Factory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_FT_Endpoint_Selector_Factory::TAO_FT_Endpoint_Selector_Factory (void)
-  :ft_endpoint_selector_ (0)
+  : ft_endpoint_selector_ (0)
 {
 }
 
 TAO_FT_Endpoint_Selector_Factory::~TAO_FT_Endpoint_Selector_Factory (void)
 {
-  if (this->ft_endpoint_selector_)
-    delete this->ft_endpoint_selector_;
+  delete this->ft_endpoint_selector_;
 }
 
 
@@ -47,6 +47,8 @@ TAO_FT_Endpoint_Selector_Factory::get_selector (
   return this->ft_endpoint_selector_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 ACE_STATIC_SVC_DEFINE (TAO_FT_Endpoint_Selector_Factory,
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
index dd7e9c57751..a93b31b0da3 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -7,7 +7,6 @@
  *  $Id$
  *
  *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- *
  */
 //=============================================================================
 #ifndef TAO_FT_ENDPOINT_SELECTOR_FACTORY_H
@@ -27,6 +26,8 @@
 
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_FT_Invocation_Endpoint_Selector;
 /**
  * @class TAO_FT_Endpoint_Selector_Factory
@@ -64,6 +65,8 @@ private:
   TAO_SYNCH_MUTEX mutex_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 //extern TAO_FT_ClientORB_Export ACE_Static_Svc_Descriptor ace_svc_desc_TAO_FT_Endpoint_Selector_Factory;
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FT_ClientORB, TAO_FT_Endpoint_Selector_Factory)
 ACE_FACTORY_DECLARE (TAO_FT_ClientORB, TAO_FT_Endpoint_Selector_Factory)
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
index ddadd6e6cca..09a2bb56a87 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
@@ -19,6 +19,7 @@ ACE_RCSID (FaultTolerance,
 # include "FT_IOGR_Property.inl"
 #endif /* ! __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Boolean
 TAO_FT_IOGR_Property::set_property (
@@ -423,3 +424,5 @@ TAO_FT_IOGR_Property::remove_primary_tag (
     }
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
index b98dc52a200..6c91f3c66d0 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
@@ -33,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Profile;
 
 /**
@@ -131,6 +133,7 @@ private:
   FT::TagFTGroupTaggedComponent *ft_group_tagged_component_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i
deleted file mode 100644
index 43e3c57df8d..00000000000
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- C++ -*-
-//
-//$Id$
-
-ACE_INLINE
-TAO_FT_IOGR_Property::TAO_FT_IOGR_Property (
-    FT::TagFTGroupTaggedComponent &ft_group)
-  :ft_group_tagged_component_ (&ft_group)
-{
-}
-
-ACE_INLINE
-TAO_FT_IOGR_Property::TAO_FT_IOGR_Property (void)
-  :ft_group_tagged_component_ (0)
-{
-}
-
-ACE_INLINE
-TAO_FT_IOGR_Property::~TAO_FT_IOGR_Property (void)
-{
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_FT_IOGR_Property::reset_tagged_components (
-    FT::TagFTGroupTaggedComponent &ft_group)
-{
-  this->ft_group_tagged_component_ =
-    &ft_group;
-
-  return 1;
-}
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl
index 43e3c57df8d..5e3a8417714 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl
@@ -2,6 +2,8 @@
 //
 //$Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_FT_IOGR_Property::TAO_FT_IOGR_Property (
     FT::TagFTGroupTaggedComponent &ft_group)
@@ -29,3 +31,5 @@ TAO_FT_IOGR_Property::reset_tagged_components (
 
   return 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
index 4545579404e..47891f3bba4 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
@@ -15,6 +15,8 @@ ACE_RCSID (FaultTolerance,
            FT_Invocation_Endpoint_Selectors,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_FT_Invocation_Endpoint_Selector::TAO_FT_Invocation_Endpoint_Selector (void)
   : TAO_Default_Endpoint_Selector ()
 {
@@ -229,3 +231,5 @@ TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary (
 
   return true;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
index 0b737f36a92..3b0f561649d 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -29,6 +29,8 @@
 #include "tao/Basic_Types.h"
 #include "tao/ORB_Constants.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Profile;
 
 /**
@@ -87,6 +89,8 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* FT_TAO_INVOCATION_ENDPOINT_SELECTOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
index 1060bbacfba..b5fe34cb281 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
@@ -13,13 +13,15 @@
 ACE_RCSID (FaultTolerance,
            FT_ORBInitializer,
            "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO_FT_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-
 }
 
 void
@@ -39,9 +41,6 @@ TAO_FT_ORBInitializer::post_init (
   this->register_client_request_interceptors (info
                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
-
-
 }
 
 void
@@ -137,3 +136,5 @@ TAO_FT_ORBInitializer::register_client_request_interceptors (
                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
index e6ca50c065c..69be6a9a3da 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
@@ -31,10 +31,12 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// RTCORBA ORB initializer.
-class TAO_FT_Export TAO_FT_ORBInitializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+class TAO_FT_ORBInitializer
+  : public virtual PortableInterceptor::ORBInitializer
+  , public virtual TAO_Local_RefCounted_Object
 {
 public:
 
@@ -66,6 +68,8 @@ private:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
index 2072fe7bbd1..dc0f72f1d3f 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
@@ -10,8 +10,7 @@
 
 ACE_RCSID (FaultTolerance, FT_PolicyFactory, "$Id$")
 
-
-
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy_ptr
 TAO_FT_PolicyFactory::create_policy (
@@ -35,3 +34,5 @@ TAO_FT_PolicyFactory::create_policy (
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
index 486581ad26a..e108bcae507 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
@@ -35,10 +35,12 @@
 
 #include "fault_tol_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Policy factory for all FTCORBA related policies.
-class TAO_FT_Export TAO_FT_PolicyFactory :
-  public PortableInterceptor::PolicyFactory,
-  public TAO_Local_RefCounted_Object
+class TAO_FT_PolicyFactory
+  : public PortableInterceptor::PolicyFactory
+  , public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -49,6 +51,8 @@ public:
                      CORBA::PolicyError));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
index 09f2735fd09..f579b080941 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
@@ -9,6 +9,8 @@
 
 ACE_RCSID(FaultTolerance, FT_Policy_i, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TimeBase::TimeT
 TAO_FT_Request_Duration_Policy::request_duration_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -253,3 +255,5 @@ TAO_FT_Heart_Beat_Enabled_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
index 36458e3e3bf..6042643f223 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   FT_Policy_i.h
@@ -21,6 +22,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
 /**
  * @class TAO_FT_Request_Duration_Policy
  *
@@ -36,7 +39,7 @@
  * to keep trying to connect to server object groups under certain
  * conditions.
  */
-class TAO_FT_Export TAO_FT_Request_Duration_Policy
+class TAO_FT_Request_Duration_Policy
   : public FT::RequestDurationPolicy,
     public TAO_Local_RefCounted_Object
 {
@@ -198,6 +201,8 @@ private:
   CORBA::Boolean heartbeat_enabled_value_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i
deleted file mode 100644
index 4caf44a0faf..00000000000
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i
+++ /dev/null
@@ -1,70 +0,0 @@
-//$Id$
-ACE_INLINE
-TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (
-    const TimeBase::TimeT &duration
-  )
-  : request_duration_ (duration)
-{
-}
-
-ACE_INLINE
-TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (
-    const TAO_FT_Request_Duration_Policy &rhs
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (),
-    ACE_NESTED_CLASS (CORBA, Policy) (),
-    ACE_NESTED_CLASS (CORBA, LocalObject) (),
-    FT::RequestDurationPolicy (),
-    TAO_Local_RefCounted_Object (),
-    request_duration_ (rhs.request_duration_)
-{
-}
-
-ACE_INLINE
-TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy (
-    const CORBA::Boolean heartbeat,
-    const TimeBase::TimeT &interval,
-    const TimeBase::TimeT &timeout
-  )
-  : heartbeat_ (heartbeat),
-    heartbeat_interval_ (interval),
-    heartbeat_timeout_ (timeout)
-{
-}
-
-ACE_INLINE
-TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy (
-    const TAO_FT_Heart_Beat_Policy &rhs
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (),
-    ACE_NESTED_CLASS (CORBA, Policy) (),
-    ACE_NESTED_CLASS (CORBA, LocalObject) (),
-    FT::HeartbeatPolicy (),
-    TAO_Local_RefCounted_Object (),
-    heartbeat_ (rhs.heartbeat_),
-    heartbeat_interval_ (rhs.heartbeat_interval_),
-    heartbeat_timeout_ (rhs.heartbeat_timeout_)
-{
-}
-
-
-ACE_INLINE
-TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy (
-    const CORBA::Boolean heartbeat
-  )
-  : heartbeat_enabled_value_ (heartbeat)
-{
-}
-
-ACE_INLINE
-TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy (
-    const TAO_FT_Heart_Beat_Enabled_Policy &rhs
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (),
-    ACE_NESTED_CLASS (CORBA, Policy) (),
-    ACE_NESTED_CLASS (CORBA, LocalObject) (),
-    FT::HeartbeatEnabledPolicy (),
-    TAO_Local_RefCounted_Object (),
-    heartbeat_enabled_value_ (rhs.heartbeat_enabled_value_)
-{
-}
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl
index 579d6c3467b..3aa80e1b0a1 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl
@@ -1,4 +1,9 @@
+// -*- C++ -*-
+//
 //$Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (const TimeBase::TimeT &duration)
   :ACE_NESTED_CLASS (CORBA, Object) ()
@@ -71,3 +76,5 @@ TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy (
   , heartbeat_enabled_value_ (rhs.heartbeat_enabled_value_)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
index 117b2e95280..9351efc0b7c 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-//
 // $Id$
 
 #include "FT_ServerORBInitializer.h"
@@ -13,13 +11,15 @@
 ACE_RCSID (FaultTolerance,
            FT_ServerORBInitializer,
            "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO_FT_ServerORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-
 }
 
 void
@@ -35,7 +35,6 @@ TAO_FT_ServerORBInitializer::post_init (
   this->register_server_request_interceptors (info
                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
 }
 
 void
@@ -98,3 +97,4 @@ TAO_FT_ServerORBInitializer::register_server_request_interceptors (
 }
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
index 6f88080afd2..cf9ef903306 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
@@ -30,10 +30,12 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// RTCORBA ORB initializer.
-class TAO_FT_ServerORB_Export TAO_FT_ServerORBInitializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+class TAO_FT_ServerORBInitializer
+  : public virtual PortableInterceptor::ORBInitializer
+  , public virtual TAO_Local_RefCounted_Object
 {
 public:
 
@@ -61,6 +63,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
index e6269801482..9f6c4a2230a 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
@@ -12,6 +12,8 @@ ACE_RCSID (FaultTolerance,
            FT_ServerPolicyFactory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Policy_ptr
 TAO_FT_ServerPolicyFactory::create_policy (
     CORBA::PolicyType type,
@@ -28,3 +30,5 @@ TAO_FT_ServerPolicyFactory::create_policy (
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
index fc1cb12b093..09a6d64d6f7 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
@@ -33,10 +33,12 @@
 
 #include "FT_ServerORB_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Policy factory for all FTCORBA related policies.
-class TAO_FT_ServerORB_Export TAO_FT_ServerPolicyFactory :
-  public PortableInterceptor::PolicyFactory,
-  public TAO_Local_RefCounted_Object
+class TAO_FT_ServerPolicyFactory
+  : public PortableInterceptor::PolicyFactory
+  , public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -47,11 +49,12 @@ public:
                      CORBA::PolicyError));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_FT_POLICY_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
index 9a12142d0e0..4f42bde34cb 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
@@ -11,6 +11,8 @@
 
 ACE_RCSID(FaultTolerance, FT_ServerPolicy_i, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Boolean
 TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value (
     ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
@@ -71,9 +73,10 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const
   return copy;
 }
 
-
 void
 TAO_FT_Heart_Beat_Enabled_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
index 4a69e2db662..ee54acfefae 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   FT_ServerPolicy_i.h
@@ -24,6 +25,7 @@
 #include "FT_ServerORB_export.h"
 #include "tao/LocalObject.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_FT_Heart_Beat_Enabled_Policy
@@ -34,9 +36,9 @@
  * the TAG_FT_HEARTBEAT_ENABLED component in the IOP profile of
  * the IOR that it exposes
  */
-class TAO_FT_ServerORB_Export TAO_FT_Heart_Beat_Enabled_Policy
-  : public FT::HeartbeatEnabledPolicy,
-    public TAO_Local_RefCounted_Object
+class TAO_FT_Heart_Beat_Enabled_Policy
+  : public FT::HeartbeatEnabledPolicy
+  , public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -79,6 +81,8 @@ private:
   CORBA::Boolean heartbeat_enabled_value_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
index d8dd25b8384..8f4f0b93709 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 //$Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy (
     const CORBA::Boolean heartbeat
@@ -20,3 +24,5 @@ TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy (
     heartbeat_enabled_value_ (rhs.heartbeat_enabled_value_)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
index f082c613dd9..01417950ea4 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 #include "FT_ServerRequest_Interceptor.h"
 #include "tao/IOP_IORC.h"
 #include "tao/ORB_Constants.h"
@@ -14,6 +12,8 @@ ACE_RCSID (FaultTolerance,
            FT_ServerRequest_Interceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   FT_ServerRequest_Interceptor::FT_ServerRequest_Interceptor (void)
@@ -28,7 +28,6 @@ namespace TAO
   {
   }
 
-
   char *
   FT_ServerRequest_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -233,3 +232,5 @@ namespace TAO
       ACE_THROW (CORBA::TRANSACTION_ROLLEDBACK ());
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
index 230267e209a..939c3fed7f2 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
@@ -32,6 +32,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace IOP
 {
   struct ServiceContext;
@@ -45,9 +47,9 @@ namespace TAO
    *
    *
    */
-  class TAO_FT_ServerORB_Export FT_ServerRequest_Interceptor
-    : public virtual PortableInterceptor::ServerRequestInterceptor,
-      public virtual TAO_Local_RefCounted_Object
+  class FT_ServerRequest_Interceptor
+    : public virtual PortableInterceptor::ServerRequestInterceptor
+    , public virtual TAO_Local_RefCounted_Object
   {
   public:
 
@@ -128,6 +130,9 @@ namespace TAO
   };
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
index 3047cec219d..826d4d06edb 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
@@ -9,6 +9,8 @@ ACE_RCSID(FaultTolerance, FT_ServerService_Activate, "$Id$")
 
 static bool initialized = false;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_FT_ServerService_Activate::TAO_FT_ServerService_Activate (void)
 {
 }
@@ -17,8 +19,6 @@ TAO_FT_ServerService_Activate::~TAO_FT_ServerService_Activate (void)
 {
 }
 
-
-
 int
 TAO_FT_ServerService_Activate::Initializer (void)
 {
@@ -43,6 +43,8 @@ TAO_FT_ServerService_Activate::Initializer (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_FT_ServerORB,TAO_FT_ServerService_Activate)
 
 ACE_STATIC_SVC_DEFINE (TAO_FT_ServerService_Activate,
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
index 3f85518f093..df27b2c2009 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  * @file FT_ServerService_Activate.h
@@ -23,6 +25,8 @@
 #include "tao/Services_Activate.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Service_Callbacks;
 
 // Forward declarations
@@ -33,7 +37,8 @@ class TAO_Service_Callbacks;
  * to the ORB.
  *
  */
-class TAO_FT_ServerORB_Export TAO_FT_ServerService_Activate : public ACE_Service_Object
+class TAO_FT_ServerORB_Export TAO_FT_ServerService_Activate
+: public ACE_Service_Object
 {
 
 public:
@@ -48,11 +53,13 @@ public:
 
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_FT_ServerService_Activate)
-ACE_FACTORY_DECLARE (TAO_FT_ServerORB, TAO_FT_ServerService_Activate)
-
 static int
 TAO_FT_Requires_ServerService_Activate = TAO_FT_ServerService_Activate::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_FT_ServerService_Activate)
+ACE_FACTORY_DECLARE (TAO_FT_ServerORB, TAO_FT_ServerService_Activate)
+
 #include /**/ "ace/post.h"
 #endif /*TAO_FT_ACTIVATE_H*/
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
index fea264b08f1..18c94f4bce1 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
@@ -10,6 +10,8 @@ ACE_RCSID(FaultTolerance, FT_Service_Activate, "$Id$")
 
 static bool initialized = false;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_FT_Service_Activate::TAO_FT_Service_Activate (void)
 {
 }
@@ -18,7 +20,6 @@ TAO_FT_Service_Activate::~TAO_FT_Service_Activate (void)
 {
 }
 
-
 TAO_Service_Callbacks *
 TAO_FT_Service_Activate::activate_services (TAO_ORB_Core *orb_core)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -66,6 +67,8 @@ TAO_FT_Service_Activate::Initializer (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_FT,TAO_FT_Service_Activate)
 
 ACE_STATIC_SVC_DEFINE (TAO_FT_Service_Activate,
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
index 1fb8e66e7f3..21d8ef638d4 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -18,6 +18,9 @@ ACE_RCSID (FaultTolerance,
            FT_Service_Callbacks,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_FT_Service_Callbacks::TAO_FT_Service_Callbacks (
     TAO_ORB_Core *orb_core)
 
@@ -253,3 +256,5 @@ TAO_FT_Service_Callbacks::now (void)
   // Add the offset to convert from posix time.
   return (sec_part + usec_part + ACE_UINT64_LITERAL (0x1B21DD213814000));
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
index c05c36eac39..3fe34415887 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  * @file FT_Service_Callbacks.h
@@ -23,6 +25,8 @@
 #include "tao/Service_Callbacks.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Profile;
 class TAO_MProfile;
 class TAO_ORB_Core;
@@ -89,5 +93,8 @@ private:
   ACE_Lock* profile_lock_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif /*TAO_FT_CALLBACKS_H*/