ChangeLogTag:Fri Nov 4 10:31:15 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

author: Ossama Othman <ossama-othman@users.noreply.github.com> 2005-11-04 18:39:05 +0000
committer: Ossama Othman <ossama-othman@users.noreply.github.com> 2005-11-04 18:39:05 +0000
commit: c633e538747abb02b61dcea041ac1a6faa6accd7 (patch)
tree: d31fd7c07cc84da23911a1402b9807afeebd85b2 /TAO/tao
parent: e7dcb66360c346d9d7ec631de64873cf5b30ebad (diff)
download: ATCD-c633e538747abb02b61dcea041ac1a6faa6accd7.tar.gz
126 files changed, 619 insertions, 128 deletions
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.h b/TAO/tao/SmartProxies/Smart_Proxies.h
index f8810fc8d40..467c1ed4267 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.h
+++ b/TAO/tao/SmartProxies/Smart_Proxies.h
@@ -1,5 +1,4 @@
-// $Id$
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,6 +26,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Smart_Proxy_Base
  *
@@ -34,10 +35,9 @@
  *
  * Contains the _var pointer to the real proxy.
  */
-class TAO_SmartProxies_Export TAO_Smart_Proxy_Base :
-  public TAO_Local_RefCounted_Object
+class TAO_SmartProxies_Export TAO_Smart_Proxy_Base
+  : public TAO_Local_RefCounted_Object
 {
-
 public:
   /// Destructor
   virtual ~TAO_Smart_Proxy_Base (void);
@@ -53,6 +53,8 @@ protected:
   CORBA::Object_var base_proxy_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "Smart_Proxies.inl"
 #endif /* defined INLINE */
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.inl b/TAO/tao/SmartProxies/Smart_Proxies.inl
index b75c0a5d096..232cacd0f34 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.inl
+++ b/TAO/tao/SmartProxies/Smart_Proxies.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Smart_Proxy_Base::TAO_Smart_Proxy_Base (void)
 {
@@ -16,3 +19,5 @@ ACE_INLINE
 TAO_Smart_Proxy_Base::~TAO_Smart_Proxy_Base (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index a9b3c726c71..2932bfea349 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -26,6 +26,8 @@ ACE_RCSID (Strategies,
            DIOP_Acceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_DIOP_Acceptor::TAO_DIOP_Acceptor (CORBA::Boolean flag)
   : TAO_Acceptor (TAO_TAG_DIOP_PROFILE),
     addrs_ (0),
@@ -747,4 +749,6 @@ TAO_DIOP_Acceptor::parse_options (const char *str)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h
index 4ff200dc543..9460c2e281c 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.h
+++ b/TAO/tao/Strategies/DIOP_Acceptor.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -32,6 +32,8 @@
 
 #include "tao/GIOP_Message_Version.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO DIOP_Acceptor concrete call defination
 
 /**
@@ -176,6 +178,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
 #include "DIOP_Acceptor.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.i b/TAO/tao/Strategies/DIOP_Acceptor.i
index 9aaf71a3d41..2603d4e7156 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.i
+++ b/TAO/tao/Strategies/DIOP_Acceptor.i
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const ACE_INET_Addr&
 TAO_DIOP_Acceptor::address (void) const
 {
@@ -21,3 +24,5 @@ TAO_DIOP_Acceptor::endpoints (void)
 
   return this->addrs_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
index e6b850f8845..1eb7e2ea49e 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -24,6 +24,9 @@
 
 ACE_RCSID(tao, DIOP_Connect, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_DIOP_SVC_HANDLER (t, 0 , 0),
     TAO_Connection_Handler (0),
@@ -165,7 +168,7 @@ TAO_DIOP_Connection_Handler::open (void*)
     return -1;
 
   this->state_changed (TAO_LF_Event::LFS_SUCCESS,
-		       this->orb_core ()->leader_follower ());
+                       this->orb_core ()->leader_follower ());
 
   return 0;
 }
@@ -298,4 +301,6 @@ TAO_DIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.h b/TAO/tao/Strategies/DIOP_Connection_Handler.h
index 933a1f4254d..6761f89b4a3 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 // ===================================================================
 /**
@@ -33,6 +33,9 @@
 #include "ace/SOCK_Dgram.h"
 #include "strategies_export.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward Decls
 class TAO_Pluggable_Messaging;
 
@@ -46,11 +49,9 @@ class TAO_Pluggable_Messaging;
  * The Connection handler which is common for the Acceptor and
  * the Connector
  */
-
-
-class TAO_Strategies_Export TAO_DIOP_Connection_Handler :
-  public TAO_DIOP_SVC_HANDLER,
-  public TAO_Connection_Handler
+class TAO_Strategies_Export TAO_DIOP_Connection_Handler
+  : public TAO_DIOP_SVC_HANDLER
+  , public TAO_Connection_Handler
 {
 
 public:
@@ -160,6 +161,8 @@ private:
   int dscp_codepoint_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index 671bac804cb..cf64af9e709 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -22,6 +22,9 @@ ACE_RCSID (Strategies,
            DIOP_Connector,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_DIOP_Connector::TAO_DIOP_Connector (CORBA::Boolean flag)
   : TAO_Connector (TAO_TAG_DIOP_PROFILE),
     lite_flag_ (flag)
@@ -232,11 +235,11 @@ TAO_DIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
 
 int
 TAO_DIOP_Connector::cancel_svc_handler (
-  TAO_Connection_Handler * svc_handler)
+  TAO_Connection_Handler * /* svc_handler */)
 {
-  ACE_UNUSED_ARG(svc_handler);
-
-  // Noop
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h
index 5cec9dbd0c8..ee457059ce5 100644
--- a/TAO/tao/Strategies/DIOP_Connector.h
+++ b/TAO/tao/Strategies/DIOP_Connector.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -28,6 +28,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Endpoint;
 class TAO_DIOP_Endpoint;
 
@@ -113,6 +115,8 @@ private:
                                      ACE_Null_Mutex > SvcHandlerIterator;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp
index f10fb9c0f7e..7bc957855df 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp
@@ -25,6 +25,8 @@ ACE_RCSID (Strategies,
 
 #include "ace/os_include/os_netdb.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const ACE_INET_Addr &addr,
                                       int use_dotted_decimal_addresses)
 
@@ -243,4 +245,7 @@ TAO_DIOP_Endpoint::object_addr (void) const
     }
   return this->object_addr_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.h b/TAO/tao/Strategies/DIOP_Endpoint.h
index 01a932546b7..b5b92fafa55 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.h
+++ b/TAO/tao/Strategies/DIOP_Endpoint.h
@@ -1,5 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,7 +22,6 @@
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
 
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -31,6 +29,7 @@
 #include "ace/INET_Addr.h"
 #include "strategies_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_DIOP_Connection_Handler;
 
@@ -138,6 +137,8 @@ private:
   TAO_DIOP_Endpoint *next_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "DIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.i b/TAO/tao/Strategies/DIOP_Endpoint.i
index 3bd443220b5..03c7835ffbe 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.i
+++ b/TAO/tao/Strategies/DIOP_Endpoint.i
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const char *
 TAO_DIOP_Endpoint::host (void) const
 {
@@ -18,3 +21,5 @@ TAO_DIOP_Endpoint::port (CORBA::UShort p)
 {
   return this->port_ = p;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/DIOP_Factory.cpp b/TAO/tao/Strategies/DIOP_Factory.cpp
index ef5755dde44..0197fe4ddaa 100644
--- a/TAO/tao/Strategies/DIOP_Factory.cpp
+++ b/TAO/tao/Strategies/DIOP_Factory.cpp
@@ -15,7 +15,9 @@ ACE_RCSID (Strategies,
            DIOP_Factory,
            "$Id$")
 
-static const char prefix_[] = "diop";
+static const char the_prefix[] = "diop";
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DIOP_Protocol_Factory::TAO_DIOP_Protocol_Factory (void)
   :  TAO_Protocol_Factory (TAO_TAG_DIOP_PROFILE),
@@ -32,13 +34,13 @@ int
 TAO_DIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
 {
   // Check for the proper prefix for this protocol.
-  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
+  return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix) == 0);
 }
 
 const char *
 TAO_DIOP_Protocol_Factory::prefix (void) const
 {
-  return ::prefix_;
+  return ::the_prefix;
 }
 
 char
@@ -92,6 +94,8 @@ TAO_DIOP_Protocol_Factory::requires_explicit_endpoint (void) const
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_DIOP_Protocol_Factory,
                        ACE_TEXT ("DIOP_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/Strategies/DIOP_Factory.h b/TAO/tao/Strategies/DIOP_Factory.h
index 5b0313bef84..f488a81c305 100644
--- a/TAO/tao/Strategies/DIOP_Factory.h
+++ b/TAO/tao/Strategies/DIOP_Factory.h
@@ -29,10 +29,13 @@
 #include "ace/Service_Config.h"
 #include "strategies_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Acceptor;
 class TAO_Connector;
 
-class TAO_Strategies_Export TAO_DIOP_Protocol_Factory : public TAO_Protocol_Factory
+class TAO_Strategies_Export TAO_DIOP_Protocol_Factory
+  : public TAO_Protocol_Factory
 {
 public:
   /// Constructor.
@@ -73,6 +76,8 @@ private:
   int minor_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_DIOP_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO_Strategies, TAO_DIOP_Protocol_Factory)
 
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index af1c9aabad4..31c6afc3e0c 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -1,6 +1,5 @@
-// This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
+
 #include "DIOP_Profile.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
@@ -20,7 +19,9 @@ ACE_RCSID (Strategies,
            DIOP_Profile,
            "$Id$")
 
-static const char prefix_[] = "diop";
+static const char the_prefix[] = "diop";
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const char TAO_DIOP_Profile::object_key_delimiter_ = '/';
 
@@ -296,7 +297,7 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
   size_t buflen = (8 /* "corbaloc" */ +
                    1 /* colon separator */ +
-                   ACE_OS::strlen (::prefix_) +
+                   ACE_OS::strlen (::the_prefix) +
                    1 /* colon separator */ +
                    1 /* major version */ +
                    1 /* decimal point */ +
@@ -314,7 +315,7 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
   ACE_OS::sprintf (buf,
                    "corbaloc:%s:%c.%c@%s:%d%c%s",
-                   ::prefix_,
+                   ::the_prefix,
                    digits [this->version_.major],
                    digits [this->version_.minor],
                    this->endpoint_.host (),
@@ -328,7 +329,7 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 const char *
 TAO_DIOP_Profile::prefix (void)
 {
-  return ::prefix_;
+  return ::the_prefix;
 }
 
 void
@@ -472,4 +473,6 @@ TAO_DIOP_Profile::decode_endpoints (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h
index e51bb10e95f..ab19f9e1e82 100644
--- a/TAO/tao/Strategies/DIOP_Profile.h
+++ b/TAO/tao/Strategies/DIOP_Profile.h
@@ -1,5 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -30,6 +29,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 #include "DIOP_Endpoint.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO DIOP_Profile concrete Profile definitions
 /**
@@ -122,6 +122,8 @@ protected:
   CORBA::ULong count_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp
index 50b4f490ad8..d6f52ea054b 100644
--- a/TAO/tao/Strategies/DIOP_Transport.cpp
+++ b/TAO/tao/Strategies/DIOP_Transport.cpp
@@ -1,4 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
 #include "DIOP_Transport.h"
@@ -23,6 +22,8 @@
 
 ACE_RCSID (tao, DIOP_Transport, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_DIOP_Transport::TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler,
                                         TAO_ORB_Core *orb_core,
                                         CORBA::Boolean flag)
@@ -332,9 +333,10 @@ int
 TAO_DIOP_Transport::messaging_init (CORBA::Octet major,
                                     CORBA::Octet minor)
 {
-  this->messaging_object_->init (major,
-                                 minor);
+  this->messaging_object_->init (major, minor);
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h
index 63c79700296..0e1c23e1e6d 100644
--- a/TAO/tao/Strategies/DIOP_Transport.h
+++ b/TAO/tao/Strategies/DIOP_Transport.h
@@ -1,5 +1,5 @@
-// This may look like C, but it's really -*- C++ -*-
 // -*- C++ -*-
+
 // ===================================================================
 /**
  *  @file   DIOP_Transport.h
@@ -29,6 +29,12 @@
 #include "ace/Svc_Handler.h"
 #include "strategies_export.h"
 
+#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
+template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decls.
 class TAO_DIOP_Connection_Handler;
 class TAO_ORB_Core;
@@ -40,10 +46,6 @@ class TAO_Acceptor;
 typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
         TAO_DIOP_SVC_HANDLER;
 
-#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
-
 /**
  * @class TAO_DIOP_Transport
  *
@@ -135,6 +137,8 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
index d1e9d6940b3..fcd76415924 100644
--- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
@@ -5,6 +5,9 @@
 
 ACE_RCSID(tao, FIFO_Connection_Purging_Strategy, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_FIFO_Connection_Purging_Strategy::TAO_FIFO_Connection_Purging_Strategy (
                                                             int cache_maximum)
  : TAO_Connection_Purging_Strategy (cache_maximum),
@@ -14,12 +17,10 @@ TAO_FIFO_Connection_Purging_Strategy::TAO_FIFO_Connection_Purging_Strategy (
 {
 }
 
-
 TAO_FIFO_Connection_Purging_Strategy::~TAO_FIFO_Connection_Purging_Strategy (void)
 {
 }
 
-
 void
 TAO_FIFO_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
 {
@@ -31,4 +32,4 @@ TAO_FIFO_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
     }
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h
index b69bcff5739..266eac1e0e7 100644
--- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h
+++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // ================================================================
 /**
  *  @file   FIFO_Connection_Purging_Strategy.h
@@ -21,6 +23,8 @@
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_FIFO_Connection_Purging_Strategy
  *
@@ -50,5 +54,7 @@ private:
   unsigned long order_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_FIFO_PURGING_STRATEGY_H */
diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
index 961ba767c8e..ae34579daaf 100644
--- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
@@ -5,6 +5,9 @@
 
 ACE_RCSID(tao, LFU_Connection_Purging_Strategy, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LFU_Connection_Purging_Strategy::TAO_LFU_Connection_Purging_Strategy (
                                                            int cache_maximum)
 : TAO_Connection_Purging_Strategy (cache_maximum)
@@ -16,10 +19,10 @@ TAO_LFU_Connection_Purging_Strategy::~TAO_LFU_Connection_Purging_Strategy (void)
 {
 }
 
-
 void
 TAO_LFU_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
 {
   transport->purging_order (transport->purging_order () + 1);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h
index b2b390c429f..c1df04e655b 100644
--- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h
+++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // ================================================================
 /**
  *  @file   LFU_Connection_Purging_Strategy.h
@@ -21,6 +23,8 @@
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_LFU_Connection_Purging_Strategy
  *
@@ -45,5 +49,7 @@ public:
   virtual void update_item (TAO_Transport* transport);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_LFU_PURGING_STRATEGY_H */
diff --git a/TAO/tao/Strategies/LF_Strategy_Null.cpp b/TAO/tao/Strategies/LF_Strategy_Null.cpp
index d3c740cb9de..5fbe04c1572 100644
--- a/TAO/tao/Strategies/LF_Strategy_Null.cpp
+++ b/TAO/tao/Strategies/LF_Strategy_Null.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "LF_Strategy_Null.h"
@@ -9,6 +8,9 @@
 
 ACE_RCSID(tao, LF_Strategy_Null, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LF_Strategy_Null::~TAO_LF_Strategy_Null (void)
 {
 }
@@ -30,3 +32,5 @@ TAO_LF_Strategy_Null::reset_event_loop_thread (int,
                                                TAO_Leader_Follower &)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/LF_Strategy_Null.h b/TAO/tao/Strategies/LF_Strategy_Null.h
index 746204fd3d0..6dff8211e9c 100644
--- a/TAO/tao/Strategies/LF_Strategy_Null.h
+++ b/TAO/tao/Strategies/LF_Strategy_Null.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_LF_Strategy_Null
  *
@@ -48,6 +50,8 @@ public:
   //@}
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "LF_Strategy_Null.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
index 930c9c89053..1e982f5c11e 100644
--- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
@@ -5,27 +5,28 @@
 
 ACE_RCSID(tao, NULL_Connection_Purging_Strategy, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_NULL_Connection_Purging_Strategy::TAO_NULL_Connection_Purging_Strategy (
                                                            int cache_maximum)
  : TAO_Connection_Purging_Strategy (cache_maximum)
 {
 }
 
-
 TAO_NULL_Connection_Purging_Strategy::~TAO_NULL_Connection_Purging_Strategy (void)
 {
 }
 
-
 void
 TAO_NULL_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
 {
   ACE_UNUSED_ARG (transport);
 }
 
-
 int
 TAO_NULL_Connection_Purging_Strategy::cache_maximum (void) const
 {
   return -1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h
index 39804305347..e0d79b76ce7 100644
--- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h
+++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // ================================================================
 /**
  *  @file   NULL_Connection_Purging_Strategy.h
@@ -21,6 +23,8 @@
 #include "tao/Connection_Purging_Strategy.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_NULL_Connection_Purging_Strategy
  *
@@ -45,5 +49,7 @@ public:
   virtual int cache_maximum (void) const;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_NULL_PURGING_STRATEGY_H */
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
index 6f0526824c4..dd4e5a32a26 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
@@ -18,6 +18,9 @@ ACE_RCSID(tao,
           SCIOP_Acceptor,
           "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SCIOP_Acceptor::TAO_SCIOP_Acceptor (CORBA::Boolean flag)
   : TAO_Acceptor (TAO_TAG_SCIOP_PROFILE),
     addrs_ (0),
@@ -1028,4 +1031,6 @@ TAO_SCIOP_Acceptor::parse_options (const char *str)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h
index a62f9e9d395..0d200b6dc80 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 // ===================================================================
 /*
@@ -34,6 +36,8 @@
 #include "tao/Acceptor_Impl.h"
 #include "tao/GIOP_Message_Version.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO SCIOP_Acceptor concrete call defination
 
 /**
@@ -218,6 +222,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
 #include "SCIOP_Acceptor.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.i b/TAO/tao/Strategies/SCIOP_Acceptor.i
index b6e6b200890..a5f51de6042 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.i
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.i
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const ACE_INET_Addr&
 TAO_SCIOP_Acceptor::address (void) const
 {
@@ -21,3 +24,5 @@ TAO_SCIOP_Acceptor::endpoints (void)
 
   return this->addrs_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
index 2b93587773d..9cc02861eb0 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
@@ -32,6 +32,8 @@ ACE_RCSID (tao,
            SCIOP_Connection_Handler,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SCIOP_Connection_Handler::TAO_SCIOP_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_SCIOP_SVC_HANDLER (t, 0 , 0),
     TAO_Connection_Handler (0),
@@ -203,7 +205,7 @@ TAO_SCIOP_Connection_Handler::open (void*)
     return -1;
 
   this->state_changed (TAO_LF_Event::LFS_SUCCESS,
-		       this->orb_core ()->leader_follower ());
+                       this->orb_core ()->leader_follower ());
 
   return 0;
 }
@@ -383,4 +385,6 @@ TAO_SCIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_pri
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.h b/TAO/tao/Strategies/SCIOP_Connection_Handler.h
index 741bb4762e4..06480e03af1 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 // ===================================================================
 /**
@@ -34,15 +36,15 @@
 #include "ace/Svc_Handler.h"
 #include "ace/SOCK_SEQPACK_Association.h"
 
-
-// Service Handler for this transport
-typedef ACE_Svc_Handler<ACE_SOCK_SEQPACK_ASSOCIATION, ACE_NULL_SYNCH>
-        TAO_SCIOP_SVC_HANDLER;
-
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
 template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_SEQPACK_ASSOCIATION, ACE_NULL_SYNCH>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// Service Handler for this transport
+typedef ACE_Svc_Handler<ACE_SOCK_SEQPACK_ASSOCIATION, ACE_NULL_SYNCH>
+        TAO_SCIOP_SVC_HANDLER;
 
 // Forward Decls
 class TAO_Pluggable_Messaging;
@@ -137,6 +139,8 @@ private:
   int dscp_codepoint_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SCIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
index afff84a56b4..a0bf8b5cdf0 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -24,6 +24,9 @@ ACE_RCSID (TAO,
            SCIOP_Connector,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SCIOP_Connector::TAO_SCIOP_Connector (CORBA::Boolean flag)
   : TAO_Connector (TAO_TAG_SCIOP_PROFILE),
     lite_flag_ (flag),
@@ -422,5 +425,6 @@ TAO_SCIOP_Connector::cancel_svc_handler (
   return -1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h
index dd6aa57d8c2..817fe65c0a8 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.h
+++ b/TAO/tao/Strategies/SCIOP_Connector.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 //=============================================================================
 /**
@@ -28,13 +30,15 @@
 
 #if TAO_HAS_SCIOP == 1
 
-class TAO_SCIOP_Endpoint;
-
 #include "ace/Connector.h"
 #include "tao/Transport_Connector.h"
 #include "tao/Connector_Impl.h"
 #include "SCIOP_Connection_Handler.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_SCIOP_Endpoint;
+
 // ****************************************************************
 
 /**
@@ -125,6 +129,8 @@ private:
   TAO_SCIOP_BASE_CONNECTOR base_connector_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SCIOP == 1 */
 
 
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
index 89ac5c3bd2c..d36c0703657 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
@@ -22,6 +22,7 @@ ACE_RCSID (Strategies,
 # include "SCIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (const ACE_INET_Addr &addr,
                                       int use_dotted_decimal_addresses)
@@ -364,4 +365,6 @@ TAO_SCIOP_Endpoint::preferred_network (void) const
   return this->preferred_path_.host.in ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.h b/TAO/tao/Strategies/SCIOP_Endpoint.h
index 0095ccfe186..d4f3e69acda 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.h
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.h
@@ -34,6 +34,8 @@
 #include "ace/INET_Addr.h"
 #include "tao/IIOP_EndpointsC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_SCIOP_Connection_Handler;
 
 /**
@@ -160,6 +162,7 @@ private:
   TAO_SCIOP_Endpoint *next_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 # include "SCIOP_Endpoint.i"
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.i b/TAO/tao/Strategies/SCIOP_Endpoint.i
index fd182741c6b..2174f62be7b 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.i
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.i
@@ -1,6 +1,8 @@
 // -*- C++ -*-
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const char *
 TAO_SCIOP_Endpoint::host (void) const
 {
@@ -18,3 +20,5 @@ TAO_SCIOP_Endpoint::port (CORBA::UShort p)
 {
   return this->port_ = p;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/SCIOP_Factory.cpp b/TAO/tao/Strategies/SCIOP_Factory.cpp
index 0383f053e2a..9f0ee8ef552 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SCIOP_Factory.cpp
@@ -13,6 +13,8 @@ ACE_RCSID (tao,
 
 static const char prefix_[] = "sciop";
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SCIOP_Protocol_Factory::TAO_SCIOP_Protocol_Factory (void)
   :  TAO_Protocol_Factory (TAO_TAG_SCIOP_PROFILE),
      major_ (TAO_DEF_SCIOP_MAJOR),
@@ -79,6 +81,8 @@ TAO_SCIOP_Protocol_Factory::requires_explicit_endpoint (void) const
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_SCIOP_Protocol_Factory,
                        ACE_TEXT ("SCIOP_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/Strategies/SCIOP_Factory.h b/TAO/tao/Strategies/SCIOP_Factory.h
index 7b4a30aab29..9e82e1282dc 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.h
+++ b/TAO/tao/Strategies/SCIOP_Factory.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 //=============================================================================
 /**
@@ -27,10 +29,13 @@
 #include "ace/Service_Config.h"
 #include "tao/Protocol_Factory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Acceptor;
 class TAO_Connector;
 
-class TAO_Strategies_Export TAO_SCIOP_Protocol_Factory : public TAO_Protocol_Factory
+class TAO_Strategies_Export TAO_SCIOP_Protocol_Factory
+: public TAO_Protocol_Factory
 {
 public:
   TAO_SCIOP_Protocol_Factory (void);
@@ -62,6 +67,8 @@ private:
   int minor_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_SCIOP_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SCIOP_Protocol_Factory)
 
diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp b/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp
index 849981f5e07..5219dc36246 100644
--- a/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp
+++ b/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp
@@ -11,6 +11,8 @@ ACE_RCSID(tao, SCIOP_Factory, "$Id$")
 
 static const char prefix_[] = "sciop";
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SCIOP_Lite_Protocol_Factory::TAO_SCIOP_Lite_Protocol_Factory (void)
   :  TAO_Protocol_Factory (TAO_TAG_SCIOP_PROFILE),
      major_ (TAO_DEF_SCIOP_MAJOR),
@@ -83,6 +85,8 @@ TAO_SCIOP_Lite_Protocol_Factory::requires_explicit_endpoint (void) const
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_SCIOP_Lite_Protocol_Factory,
                        ACE_TEXT ("SCIOP_Lite_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.h b/TAO/tao/Strategies/SCIOP_Lite_Factory.h
index cdade7a16e9..bfb45d950cb 100644
--- a/TAO/tao/Strategies/SCIOP_Lite_Factory.h
+++ b/TAO/tao/Strategies/SCIOP_Lite_Factory.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 //==========================================================================
 /**
@@ -27,6 +29,7 @@
 #include "ace/Service_Config.h"
 #include "tao/Protocol_Factory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Acceptor;
 class TAO_Connector;
@@ -65,6 +68,8 @@ private:
   int minor_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_SCIOP_Lite_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SCIOP_Lite_Protocol_Factory)
 
diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp
index 7c48f8e3f8e..7b12fe57871 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SCIOP_Profile.cpp
@@ -21,14 +21,14 @@ static const char prefix_[] = "sciop";
 
 const char TAO_SCIOP_Profile::object_key_delimiter_ = '/';
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 char
 TAO_SCIOP_Profile::object_key_delimiter (void) const
 {
   return TAO_SCIOP_Profile::object_key_delimiter_;
 }
 
-
-
 TAO_SCIOP_Profile::TAO_SCIOP_Profile (const ACE_INET_Addr &addr,
                                     const TAO::ObjectKey &object_key,
                                     const TAO_GIOP_Message_Version &version,
@@ -513,4 +513,6 @@ TAO_SCIOP_Profile::decode_endpoints (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h
index 5310af754b0..688b3efb1ed 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.h
+++ b/TAO/tao/Strategies/SCIOP_Profile.h
@@ -28,6 +28,7 @@
 
 #include "SCIOP_Endpoint.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO SCIOP_Profile concrete Profile definitions
 /**
@@ -133,6 +134,8 @@ protected:
   CORBA::ULong count_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SCIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp
index a5acf0d6395..ae22a9f796c 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SCIOP_Transport.cpp
@@ -25,6 +25,8 @@ ACE_RCSID (tao,
            SCIOP_Transport,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SCIOP_Transport::TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler,
                                         TAO_ORB_Core *orb_core,
                                         CORBA::Boolean )
@@ -380,4 +382,6 @@ TAO_SCIOP_Transport::get_listen_point (
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h
index e51f42b5778..a794cccc5be 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.h
+++ b/TAO/tao/Strategies/SCIOP_Transport.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 // ===================================================================
 /**
@@ -27,6 +29,8 @@
 #include "tao/IIOPC.h"
 #include "ace/SOCK_SEQPACK_Association.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decls.
 class TAO_SCIOP_Connection_Handler;
 class TAO_ORB_Core;
@@ -137,6 +141,8 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SCIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index 2e3d09fdb33..78557535a7d 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -1,4 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
 #include "SHMIOP_Acceptor.h"
@@ -20,6 +19,8 @@ ACE_RCSID (Strategies,
            SHMIOP_Acceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor (CORBA::Boolean flag)
   : TAO_Acceptor (TAO_TAG_SHMEM_PROFILE),
     version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
@@ -506,4 +507,6 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.h b/TAO/tao/Strategies/SHMIOP_Acceptor.h
index ef369ad0f9c..8fc08931336 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 // $Id$
 
 // ============================================================================
@@ -38,6 +38,8 @@
 #include "tao/GIOP_Message_Version.h"
 // TAO SHMIOP_Acceptor concrete call definitions
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_SHMIOP_Acceptor
  *
@@ -148,6 +150,8 @@ private:
   CORBA::Boolean lite_flag_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index 9d384859ff7..77fb0542194 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -24,6 +24,8 @@ ACE_RCSID (Strategies,
            SHMIOP_Connection_Handler,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_SHMIOP_SVC_HANDLER (t, 0 , 0),
     TAO_Connection_Handler (0)
@@ -157,7 +159,7 @@ TAO_SHMIOP_Connection_Handler::open (void*)
 
   // Not needed, anyway
   this->state_changed (TAO_LF_Event::LFS_SUCCESS,
-		       this->orb_core ()->leader_follower ());
+                       this->orb_core ()->leader_follower ());
 
   return 0;
 }
@@ -250,4 +252,6 @@ TAO_SHMIOP_Connection_Handler::add_transport_to_cache (void)
                                      this->transport ());
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /*(TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) */
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
index fbfa34bc1fc..6f4001159b9 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 // ===================================================================
 /**
@@ -31,6 +31,9 @@
 #include "SHMIOP_Transport.h"
 
 // ****************************************************************
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_SHMIOP_Connection_Handler
  *
@@ -39,8 +42,6 @@
  * The Connection handler which is common for the Acceptor and
  * the Connector
  */
-
-
 class TAO_Strategies_Export TAO_SHMIOP_Connection_Handler :
   public TAO_SHMIOP_SVC_HANDLER,
   public TAO_Connection_Handler
@@ -103,6 +104,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index a4039a0cb85..f9e1faef722 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -21,6 +21,8 @@ ACE_RCSID (Strategies,
            SHMIOP_Connector,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SHMIOP_Connector::TAO_SHMIOP_Connector (CORBA::Boolean flag)
   : TAO_Connector (TAO_TAG_SHMEM_PROFILE),
     connect_strategy_ (),
@@ -33,7 +35,6 @@ TAO_SHMIOP_Connector::~TAO_SHMIOP_Connector (void)
 {
 }
 
-
 int
 TAO_SHMIOP_Connector::open (TAO_ORB_Core *orb_core)
 {
@@ -348,5 +349,6 @@ TAO_SHMIOP_Connector::cancel_svc_handler (
   return -1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h
index d4b41468c55..0d958d83ea9 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.h
+++ b/TAO/tao/Strategies/SHMIOP_Connector.h
@@ -34,6 +34,8 @@
 #include "tao/Resource_Factory.h"
 #include "tao/Connector_Impl.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_SHMIOP_Endpoint;
 
 // ****************************************************************
@@ -127,6 +129,8 @@ private:
   CORBA::Boolean lite_flag_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
index 8d2ca160b58..bea6b1bb00f 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
@@ -1,7 +1,5 @@
-// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-
 #include "SHMIOP_Endpoint.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
@@ -24,6 +22,8 @@ ACE_RCSID (Strategies,
 
 #include "ace/os_include/os_netdb.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SHMIOP_Endpoint::TAO_SHMIOP_Endpoint (const ACE_MEM_Addr &addr,
                                           int use_dotted_decimal_addresses)
   : TAO_Endpoint (TAO_TAG_SHMEM_PROFILE)
@@ -260,4 +260,7 @@ TAO_SHMIOP_Endpoint::object_addr (void) const
 
   return this->object_addr_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.h b/TAO/tao/Strategies/SHMIOP_Endpoint.h
index c44a9f6705f..a35aaf81e04 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.h
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.h
@@ -31,6 +31,7 @@
 #include "ace/MEM_Addr.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_SHMIOP_Endpoint
@@ -135,6 +136,8 @@ private:
   TAO_SHMIOP_Endpoint *next_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "SHMIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.i b/TAO/tao/Strategies/SHMIOP_Endpoint.i
index e5a11fae5ab..e507b39c440 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.i
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.i
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const char *
 TAO_SHMIOP_Endpoint::host (void) const
 {
@@ -18,3 +21,5 @@ TAO_SHMIOP_Endpoint::port (CORBA::UShort p)
 {
   return this->port_ = p;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/SHMIOP_Factory.cpp b/TAO/tao/Strategies/SHMIOP_Factory.cpp
index 6d49937a410..9237f0ef236 100644
--- a/TAO/tao/Strategies/SHMIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Factory.cpp
@@ -19,6 +19,8 @@ ACE_RCSID (Strategies,
 
 static const char prefix_[] = "shmiop";
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SHMIOP_Protocol_Factory::TAO_SHMIOP_Protocol_Factory (void)
   : TAO_Protocol_Factory (TAO_TAG_SHMEM_PROFILE),
     major_ (TAO_DEF_GIOP_MAJOR),
@@ -116,6 +118,8 @@ TAO_SHMIOP_Protocol_Factory::requires_explicit_endpoint (void) const
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_SHMIOP_Protocol_Factory,
                        ACE_TEXT ("SHMIOP_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/Strategies/SHMIOP_Factory.h b/TAO/tao/Strategies/SHMIOP_Factory.h
index 4093b9069e6..4c577d34a0c 100644
--- a/TAO/tao/Strategies/SHMIOP_Factory.h
+++ b/TAO/tao/Strategies/SHMIOP_Factory.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 // $Id$
 // ============================================================================
 //
@@ -31,10 +32,13 @@
 
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Acceptor;
 class TAO_Connector;
 
-class TAO_Strategies_Export TAO_SHMIOP_Protocol_Factory : public TAO_Protocol_Factory
+class TAO_Strategies_Export TAO_SHMIOP_Protocol_Factory
+  : public TAO_Protocol_Factory
 {
 public:
   /// Constructor.
@@ -87,6 +91,8 @@ private:
   off_t min_bytes_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_SHMIOP_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SHMIOP_Protocol_Factory)
 
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index db66c5aa82d..32e4e4ea534 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -20,6 +20,8 @@ ACE_RCSID (Strategies,
 
 static const char prefix_[] = "shmiop";
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 const char TAO_SHMIOP_Profile::object_key_delimiter_ = '/';
 
 char
@@ -509,4 +511,6 @@ TAO_SHMIOP_Profile::decode_endpoints (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h
index b7f367aea82..bb3fed66847 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.h
+++ b/TAO/tao/Strategies/SHMIOP_Profile.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -31,6 +31,7 @@
 #include "tao/Profile.h"
 #include "SHMIOP_Endpoint.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO SHMIOP_Profile concrete Profile definitions
 /**
@@ -122,6 +123,8 @@ private:
   CORBA::ULong count_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp
index 47fe0a6c898..e1579bae9a1 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp
@@ -1,4 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
 #include "SHMIOP_Transport.h"
@@ -20,6 +19,9 @@
 
 ACE_RCSID (Strategies, SHMIOP_Transport, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SHMIOP_Transport::TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handler,
                                             TAO_ORB_Core *orb_core,
                                             CORBA::Boolean flag)
@@ -258,4 +260,6 @@ TAO_SHMIOP_Transport::messaging_init (CORBA::Octet major,
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h
index a8655d8c1db..c94a55c8582 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.h
+++ b/TAO/tao/Strategies/SHMIOP_Transport.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 // ===================================================================
 /**
@@ -29,6 +29,12 @@
 #include "ace/MEM_Stream.h"
 #include "tao/Transport.h"
 
+#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
+template class TAO_Strategies_Export ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>;
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_SHMIOP_Connection_Handler;
 class TAO_Pluggable_Messaging;
 class TAO_Target_Specification;
@@ -37,10 +43,6 @@ class Tao_Operation_Details;
 typedef ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>
          TAO_SHMIOP_SVC_HANDLER;
 
-#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-template class TAO_Strategies_Export ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
-
 /**
  * @class TAO_SHMIOP_Transport
  *
@@ -116,6 +118,8 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp
index 4ec98202ca3..81304e7301a 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp
@@ -19,6 +19,8 @@ ACE_RCSID (Strategies,
            UIOP_Acceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (CORBA::Boolean flag)
   : TAO_Acceptor (TAO_TAG_UIOP_PROFILE),
     base_acceptor_ (),
@@ -477,4 +479,6 @@ TAO_UIOP_Acceptor::parse_options (const char *str)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.h b/TAO/tao/Strategies/UIOP_Acceptor.h
index 7610ce7f277..7ce65dbf5b4 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.h
+++ b/TAO/tao/Strategies/UIOP_Acceptor.h
@@ -34,6 +34,8 @@
 #include "ace/Acceptor.h"
 #include "ace/LSOCK_Acceptor.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_UIOP_Acceptor
  *
@@ -135,6 +137,8 @@ private:
   const bool lite_flag_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 # endif /* TAO_HAS_UIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index 7db6103a5d2..f6997db70cf 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -23,6 +23,7 @@ ACE_RCSID (Strategies,
            UIOP_Connection_Handler,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_UIOP_SVC_HANDLER (t, 0 , 0),
@@ -137,7 +138,7 @@ TAO_UIOP_Connection_Handler::open (void*)
     return -1;
 
   this->state_changed (TAO_LF_Event::LFS_SUCCESS,
-		       this->orb_core ()->leader_follower ());
+                       this->orb_core ()->leader_follower ());
 
   return 0;
 }
@@ -228,4 +229,6 @@ TAO_UIOP_Connection_Handler::add_transport_to_cache (void)
                                      this->transport ());
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /*TAO_HAS_UIOP == 1*/
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.h b/TAO/tao/Strategies/UIOP_Connection_Handler.h
index ca14c8aeb4a..881612ef782 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 // ===================================================================
 /**
@@ -34,6 +34,8 @@
 #include "tao/Wait_Strategy.h"
 #include "UIOP_Transport.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward Decls
 class TAO_Pluggable_Messaging;
 
@@ -86,7 +88,6 @@ public:
                               const void *act = 0);
   //@}
 
-
   /// Add ourselves to Cache.
   int add_transport_to_cache (void);
 
@@ -100,6 +101,8 @@ protected:
   //@}
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_UIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 6ce63d9709a..ca01621b774 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -21,6 +21,8 @@ ACE_RCSID(Strategies,
           UIOP_Connector,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UIOP_Connector::TAO_UIOP_Connector (CORBA::Boolean flag)
   : TAO_Connector (TAO_TAG_UIOP_PROFILE),
     connect_strategy_ (),
@@ -395,7 +397,7 @@ TAO_UIOP_Connector::cancel_svc_handler (
   TAO_Connection_Handler * svc_handler)
 {
   TAO_UIOP_Connection_Handler* handler=
-    dynamic_cast<TAO_UIOP_Connection_Handler*>(svc_handler);
+    dynamic_cast<TAO_UIOP_Connection_Handler*> (svc_handler);
 
   if (handler)
     // Cancel from the connector
@@ -404,4 +406,6 @@ TAO_UIOP_Connector::cancel_svc_handler (
   return -1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h
index e53b09b3295..327537ec5d2 100644
--- a/TAO/tao/Strategies/UIOP_Connector.h
+++ b/TAO/tao/Strategies/UIOP_Connector.h
@@ -35,6 +35,8 @@
 #include "tao/Resource_Factory.h"
 #include "tao/Connector_Impl.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_UIOP_Endpoint;
 class TAO_Endpoint;
 
@@ -73,7 +75,7 @@ public:
 
   virtual TAO_Profile *corbaloc_scan (const char *str, size_t &len
                                       ACE_ENV_ARG_DECL);
-  
+
   virtual char object_key_delimiter (void) const;
 
   /// Cancel the passed cvs handler from the connector
@@ -131,6 +133,8 @@ private:
   const bool lite_flag_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 # endif  /* TAO_HAS_UIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.cpp b/TAO/tao/Strategies/UIOP_Endpoint.cpp
index d843a8b2d14..5eca79cdf3c 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/UIOP_Endpoint.cpp
@@ -18,6 +18,7 @@ ACE_RCSID (Strategies,
 # include "UIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIOP_Endpoint::TAO_UIOP_Endpoint (const ACE_UNIX_Addr &addr,
                                       CORBA::Short priority)
@@ -102,4 +103,7 @@ TAO_UIOP_Endpoint::hash (void)
 
   return this->hash_val_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.h b/TAO/tao/Strategies/UIOP_Endpoint.h
index f788dc014d6..c515f11885a 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.h
+++ b/TAO/tao/Strategies/UIOP_Endpoint.h
@@ -27,6 +27,7 @@
 #include "strategies_export.h"
 #include "ace/UNIX_Addr.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_UIOP_Endpoint
@@ -91,6 +92,8 @@ private:
   TAO_UIOP_Endpoint *next_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "UIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.i b/TAO/tao/Strategies/UIOP_Endpoint.i
index 337bbae6a76..a7a01b59c3d 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.i
+++ b/TAO/tao/Strategies/UIOP_Endpoint.i
@@ -1,19 +1,23 @@
 // -*- C++ -*-
+//
 // $Id$
 
 # if TAO_HAS_UIOP == 1
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const ACE_UNIX_Addr &
 TAO_UIOP_Endpoint::object_addr (void) const
 {
   return this->object_addr_;
 }
 
-
 ACE_INLINE const char *
 TAO_UIOP_Endpoint::rendezvous_point (void) const
 {
   return this->object_addr_.get_path_name ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Factory.cpp b/TAO/tao/Strategies/UIOP_Factory.cpp
index 080f76eccc8..f96cbbc97df 100644
--- a/TAO/tao/Strategies/UIOP_Factory.cpp
+++ b/TAO/tao/Strategies/UIOP_Factory.cpp
@@ -20,6 +20,8 @@ ACE_RCSID (Strategies,
 
 static const char prefix_[] = "uiop";
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UIOP_Protocol_Factory::TAO_UIOP_Protocol_Factory (void)
   :  TAO_Protocol_Factory (TAO_TAG_UIOP_PROFILE),
      major_ (TAO_DEF_GIOP_MAJOR),
@@ -87,6 +89,8 @@ TAO_UIOP_Protocol_Factory::requires_explicit_endpoint (void) const
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_UIOP_Protocol_Factory,
                        ACE_TEXT ("UIOP_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/Strategies/UIOP_Factory.h b/TAO/tao/Strategies/UIOP_Factory.h
index 6214e67f0a1..17dbb32fe44 100644
--- a/TAO/tao/Strategies/UIOP_Factory.h
+++ b/TAO/tao/Strategies/UIOP_Factory.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 // $Id$
 // ============================================================================
 //
@@ -31,6 +32,8 @@
 #include "strategies_export.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Acceptor;
 class TAO_Connector;
 
@@ -75,6 +78,8 @@ private:
   // compatibility with old clients.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_UIOP_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO_Strategies, TAO_UIOP_Protocol_Factory)
 
diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
index b86f8fe3856..4fd189274cf 100644
--- a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
+++ b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
@@ -18,6 +18,8 @@ ACE_RCSID (Strategies,
 
 static const char prefix_[] = "uiop";
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UIOP_Lite_Protocol_Factory::TAO_UIOP_Lite_Protocol_Factory (void)
   :  TAO_Protocol_Factory (TAO_TAG_UIOP_PROFILE),
      major_ (TAO_DEF_GIOP_MAJOR),
@@ -89,6 +91,8 @@ TAO_UIOP_Lite_Protocol_Factory::requires_explicit_endpoint (void) const
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_UIOP_Lite_Protocol_Factory,
                        ACE_TEXT ("UIOP_Lite_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.h b/TAO/tao/Strategies/UIOP_Lite_Factory.h
index 332506d4dbd..72de6079253 100644
--- a/TAO/tao/Strategies/UIOP_Lite_Factory.h
+++ b/TAO/tao/Strategies/UIOP_Lite_Factory.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 // $Id$
 // ============================================================================
 //
@@ -31,10 +32,11 @@
 #include "strategies_export.h"
 #include "tao/Protocol_Factory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Acceptor;
 class TAO_Connector;
 
-
 class TAO_Strategies_Export TAO_UIOP_Lite_Protocol_Factory :
   public TAO_Protocol_Factory
 {
@@ -78,6 +80,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_UIOP_Lite_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO_Strategies, TAO_UIOP_Lite_Protocol_Factory)
 
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index 76ba5ede816..15b4219ac17 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -20,6 +20,8 @@ ACE_RCSID (Strategies,
 
 static const char prefix_[] = "uiop";
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 const char TAO_UIOP_Profile::object_key_delimiter_ = '|';
 
 char
@@ -447,4 +449,6 @@ TAO_UIOP_Profile::decode_endpoints (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h
index 069c5105965..dd01aff2397 100644
--- a/TAO/tao/Strategies/UIOP_Profile.h
+++ b/TAO/tao/Strategies/UIOP_Profile.h
@@ -34,6 +34,7 @@
 
 #include "ace/UNIX_Addr.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_UIOP_Profile
@@ -120,6 +121,8 @@ private:
   CORBA::ULong count_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 # endif  /* TAO_HAS_UIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp
index df5a0032644..f8e80a52a24 100644
--- a/TAO/tao/Strategies/UIOP_Transport.cpp
+++ b/TAO/tao/Strategies/UIOP_Transport.cpp
@@ -20,6 +20,9 @@ ACE_RCSID (Strategies,
            UIOP_Transport,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UIOP_Transport::TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler,
                                         TAO_ORB_Core *orb_core,
                                         CORBA::Boolean flag)
@@ -183,7 +186,6 @@ TAO_UIOP_Transport::send_message (TAO_OutputCDR &stream,
   return 1;
 }
 
-
 int
 TAO_UIOP_Transport::messaging_init (CORBA::Octet major,
                                     CORBA::Octet minor)
@@ -193,4 +195,6 @@ TAO_UIOP_Transport::messaging_init (CORBA::Octet major,
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_UIOP */
diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h
index aefcb26ecbc..8e81650ece2 100644
--- a/TAO/tao/Strategies/UIOP_Transport.h
+++ b/TAO/tao/Strategies/UIOP_Transport.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 // ===================================================================
 /**
@@ -30,6 +30,8 @@
 #include "ace/Svc_Handler.h"
 #include "tao/Transport.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decls.
 
 class TAO_ORB_Core;
@@ -110,6 +112,8 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 # endif  /* TAO_HAS_UIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index 9d55507eb56..f1341d56135 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -37,6 +37,8 @@
 
 ACE_RCSID(Strategies, advanced_resource, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer (void)
 {
 
@@ -878,6 +880,8 @@ TAO_Advanced_Resource_Factory::report_unsupported_error (
              option_name));
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 ACE_STATIC_SVC_DEFINE (TAO_Advanced_Resource_Factory,
diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h
index 17c1279003c..12b1ce6a5e4 100644
--- a/TAO/tao/Strategies/advanced_resource.h
+++ b/TAO/tao/Strategies/advanced_resource.h
@@ -13,6 +13,8 @@
 
 #include "tao/ORB_Core.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Connection_Purging_Strategy;
 
 class TAO_Strategies_Export TAO_Resource_Factory_Changer
@@ -132,10 +134,12 @@ protected:
 
 };
 
+static TAO_Resource_Factory_Changer TAO_changer;
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_Advanced_Resource_Factory)
 ACE_FACTORY_DECLARE (TAO_Strategies, TAO_Advanced_Resource_Factory)
 
-static TAO_Resource_Factory_Changer TAO_changer;
-
 #include /**/ "ace/post.h"
 #endif /* TAO_ADVANCED_RESOURCE_H */
diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
index e74548609e5..3cdb3a9d07c 100644
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
+++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
@@ -14,6 +14,7 @@ ACE_RCSID (TypeCodeFactory,
            Recursive_TypeCode,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
 TAO::TypeCodeFactory::Recursive_TypeCode::tao_marshal (
@@ -276,3 +277,5 @@ TAO::TypeCodeFactory::Recursive_TypeCode::concrete_base_type_i (
   return
     this->the_typecode_->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
index 1636cb666ad..0f92a9bdc8b 100644
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
+++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
@@ -20,6 +20,8 @@
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/True_RefCount_Policy.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace TypeCodeFactory
@@ -118,6 +120,7 @@ namespace TAO
   }  // End namespace TypeCodeFactory
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #ifdef __ACE_INLINE__
 # include "tao/TypeCodeFactory/Recursive_TypeCode.inl"
diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl
index a053fbddf5d..6fa35755fad 100644
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl
+++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO::TypeCodeFactory::Recursive_TypeCode::Recursive_TypeCode (char const * id)
@@ -26,3 +27,5 @@ TAO::TypeCodeFactory::Recursive_TypeCode::the_typecode (CORBA::TypeCode_ptr tc)
   mutable_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
index 3c041038f87..d8d6a7e9672 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
@@ -12,6 +12,8 @@ ACE_RCSID (TypeCodeFactory,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_TypeCodeFactory_Adapter_Impl::~TAO_TypeCodeFactory_Adapter_Impl (void)
 {
 }
@@ -407,6 +409,8 @@ TAO_TypeCodeFactory_Adapter_Impl::Initializer (void)
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_TypeCodeFactory_Adapter_Impl);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (
     TAO_TypeCodeFactory_Adapter_Impl,
     ACE_TEXT ("Concrete_TypeCodeFactory_Adapter"),
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
index b0d09a41fb4..2dae9e9a027 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -25,6 +25,8 @@
 #include "ace/Service_Config.h"
 #include "tao/default_environment.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_TypeCodeFactory_Adapter_Impl
  *
@@ -248,12 +250,15 @@ public:
   static int Initializer (void);
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_TypeCodeFactory_Adapter_Impl)
-ACE_FACTORY_DECLARE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Adapter_Impl)
-
 static int
 TAO_Requires_TypeCodeFactory_Initializer =
   TAO_TypeCodeFactory_Adapter_Impl::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_TypeCodeFactory_Adapter_Impl)
+ACE_FACTORY_DECLARE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Adapter_Impl)
+
+
 #include /**/ "ace/post.h"
 #endif /* TAO_TYPECODEFACTORY_ADAPTER_IMPL_H */
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
index b6fcd5eb57e..a6bba4bb7a6 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // =================================================================
@@ -19,6 +20,8 @@
 
 ACE_RCSID(TypeCodeFactory, TypeCodeFactory_Loader, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_TypeCodeFactory_Loader::TAO_TypeCodeFactory_Loader (void)
 {
 }
@@ -43,6 +46,9 @@ TAO_TypeCodeFactory_Loader::Initializer (void)
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_TypeCodeFactory_Loader);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
 ACE_STATIC_SVC_DEFINE (
     TAO_TypeCodeFactory_Loader,
     ACE_TEXT ("TypeCodeFactory_Loader"),
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
index 7cef34fafe8..9a6faf3909f 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,6 +23,8 @@
 
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_TypeCodeFactory_Loader
  *
@@ -47,12 +49,14 @@ public:
   static int Initializer (void);
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_TypeCodeFactory_Loader)
-ACE_FACTORY_DECLARE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Loader)
-
 static int
 TAO_Requires_TCF_Initializer = TAO_TypeCodeFactory_Loader::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_TypeCodeFactory_Loader)
+ACE_FACTORY_DECLARE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Loader)
+
 #define TAO_TYPECODEFACTORY_SAFE_INCLUDE
 #include "TypeCodeFactoryC.h"
 #undef TAO_TYPECODEFACTORY_SAFE_INCLUDE
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index 37e3c21b498..2232a94fc50 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -44,6 +44,7 @@ ACE_RCSID (TypeCodeFactory,
            TypeCodeFactory_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TCF
 {
@@ -2097,3 +2098,5 @@ TAO_TypeCodeFactory_i::make_recursive_tc (CORBA::TCKind kind,
   return tc;
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
index 82a138ef191..81913877a86 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
@@ -27,6 +27,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -312,6 +313,8 @@ private:
   TAO_TypeCodeFactory_i &operator= (const TAO_TypeCodeFactory_i &src);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/Utils/Encodable.cpp b/TAO/tao/Utils/Encodable.cpp
index 7e6aa6c57aa..1f377302158 100644
--- a/TAO/tao/Utils/Encodable.cpp
+++ b/TAO/tao/Utils/Encodable.cpp
@@ -2,6 +2,10 @@
 
 #include "Encodable.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Encodable::~TAO_Encodable (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/Encodable.h b/TAO/tao/Utils/Encodable.h
index 8edb09c43ef..ace15cb7089 100644
--- a/TAO/tao/Utils/Encodable.h
+++ b/TAO/tao/Utils/Encodable.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -25,6 +26,8 @@
 
 #include "utils_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_OutputCDR;
 class TAO_InputCDR;
 
@@ -52,6 +55,8 @@ public:
   virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ENCODABLE_H_ */
diff --git a/TAO/tao/Utils/Implicit_Deactivator.cpp b/TAO/tao/Utils/Implicit_Deactivator.cpp
index e5d3c35d594..a050334804c 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.cpp
+++ b/TAO/tao/Utils/Implicit_Deactivator.cpp
@@ -4,6 +4,9 @@
 ACE_RCSID (Utils,
            Implicit_Deactivator,
            "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO::Utils::Implicit_Deactivation_Functor::operator () (
    PortableServer::ServantBase * servant)
@@ -31,3 +34,5 @@ TAO::Utils::Implicit_Deactivation_Functor::operator () (
     }
   ACE_ENDTRY;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/Implicit_Deactivator.h b/TAO/tao/Utils/Implicit_Deactivator.h
index bb172759571..c21e75bfd85 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.h
+++ b/TAO/tao/Utils/Implicit_Deactivator.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  * @file Implicit_Deactivator.h
@@ -21,6 +22,7 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/Auto_Functor.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -55,5 +57,7 @@ namespace TAO
   } // namespace Utils
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /*TAO_UTILS_IMPLICIT_DEACTIVATOR_H*/
diff --git a/TAO/tao/Utils/ORB_Destroyer.cpp b/TAO/tao/Utils/ORB_Destroyer.cpp
index c3e198c9828..e81a0bde780 100644
--- a/TAO/tao/Utils/ORB_Destroyer.cpp
+++ b/TAO/tao/Utils/ORB_Destroyer.cpp
@@ -4,6 +4,9 @@
 ACE_RCSID (Utils,
            ORB_Destroyer,
            "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO::Utils::ORB_Destroyer_Functor::operator() (CORBA::ORB_ptr orb)
   ACE_THROW_SPEC (())
@@ -20,3 +23,5 @@ TAO::Utils::ORB_Destroyer_Functor::operator() (CORBA::ORB_ptr orb)
     }
   ACE_ENDTRY;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/ORB_Destroyer.h b/TAO/tao/Utils/ORB_Destroyer.h
index 6e414d99ead..5f7906017fd 100644
--- a/TAO/tao/Utils/ORB_Destroyer.h
+++ b/TAO/tao/Utils/ORB_Destroyer.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  * @file ORB_Destroyer.h
@@ -20,6 +21,8 @@
 #include "tao/ORB.h"
 #include "ace/Auto_Functor.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Utils
@@ -53,5 +56,7 @@ namespace TAO
   } // namespace Utils
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_UTILS_ORB_DESTROYER_H*/
diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp
index 08618700659..1202e6f33c7 100644
--- a/TAO/tao/Utils/ORB_Manager.cpp
+++ b/TAO/tao/Utils/ORB_Manager.cpp
@@ -25,6 +25,9 @@ ACE_RCSID (PortableServer,
            ORB_Manager,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // constructor
 TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb,
                                   PortableServer::POA_ptr poa,
@@ -364,3 +367,5 @@ TAO_ORB_Manager::~TAO_ORB_Manager (void)
     }
   ACE_ENDTRY;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/ORB_Manager.h b/TAO/tao/Utils/ORB_Manager.h
index a181e1c5d12..9aab1c8ee11 100644
--- a/TAO/tao/Utils/ORB_Manager.h
+++ b/TAO/tao/Utils/ORB_Manager.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,6 +23,8 @@
 
 #include "tao/ORB.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_ORB_Manager
  *
@@ -249,6 +251,7 @@ protected:
   PortableServer::POAManager_var poa_manager_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /* TAO_ORB_MANAGER_H */
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.cpp b/TAO/tao/Utils/PolicyList_Destroyer.cpp
index e2aaab09b5e..c6490f4027c 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.cpp
+++ b/TAO/tao/Utils/PolicyList_Destroyer.cpp
@@ -9,6 +9,8 @@ ACE_RCSID (Utils,
            PolicyList_Deactivator,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer()
   ACE_THROW_SPEC (())
 {
@@ -35,3 +37,5 @@ TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer()
       (*this)[i] = CORBA::Policy::_nil();
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.inl b/TAO/tao/Utils/PolicyList_Destroyer.inl
index 1bc3d224276..a93e6334c87 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.inl
+++ b/TAO/tao/Utils/PolicyList_Destroyer.inl
@@ -1,7 +1,13 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO::Utils::PolicyList_Destroyer::PolicyList_Destroyer (CORBA::ULong length_hint)
   : CORBA::PolicyList(length_hint)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp
index 18299880b5a..e4d909533d6 100644
--- a/TAO/tao/Utils/RIR_Narrow.cpp
+++ b/TAO/tao/Utils/RIR_Narrow.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #ifndef TAO_UTILS_RIR_NARROW_CPP
 #define TAO_UTILS_RIR_NARROW_CPP
 
@@ -7,9 +9,7 @@
   #include <stdexcept>
 #endif
 
-ACE_RCSID (Utils,
-           RIR_Narror,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type
 TAO::Utils::RIR_Narrow<T>::narrow (CORBA::ORB_ptr orb,
@@ -55,4 +55,6 @@ TAO::Utils::RIR_Narrow<T>::narrow_object (CORBA::Object_ptr object
   return narrowed_object._retn ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /*TAO_UTILS_RIR_NARROW_CPP*/
diff --git a/TAO/tao/Utils/RIR_Narrow.h b/TAO/tao/Utils/RIR_Narrow.h
index 24a7ad5c089..afe67295638 100644
--- a/TAO/tao/Utils/RIR_Narrow.h
+++ b/TAO/tao/Utils/RIR_Narrow.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  * @file RIR_Narrow.h
@@ -23,6 +24,8 @@
 #include "tao/PI/PI.h"
 #include "tao/ORB.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Utils
@@ -60,6 +63,9 @@ namespace TAO
   } // namespace Utils
 } // namespace TAO
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 # include "RIR_Narrow.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/tao/Utils/Servant_Var.h b/TAO/tao/Utils/Servant_Var.h
index 8655ddb9a07..70d874f6735 100644
--- a/TAO/tao/Utils/Servant_Var.h
+++ b/TAO/tao/Utils/Servant_Var.h
@@ -21,6 +21,8 @@
 #include "ace/CORBA_macros.h"
 #include "tao/Environment.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Utils
@@ -151,6 +153,8 @@ namespace TAO
   } // namespace Utils
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "Servant_Var.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Utils/Servant_Var.inl b/TAO/tao/Utils/Servant_Var.inl
index 8716ed46cdf..6396237bc9c 100644
--- a/TAO/tao/Utils/Servant_Var.inl
+++ b/TAO/tao/Utils/Servant_Var.inl
@@ -5,6 +5,8 @@
 #include "tao/Exception.h"
 #include "ace/Swap.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T>
 ACE_INLINE T *
 TAO::Utils::Servant_Var<T>::_duplicate (T * p)
@@ -202,3 +204,5 @@ operator!= (typename TAO::Utils::Servant_Var<X> const & x,
 {
   return x.in () != y.in ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/Synch_Refcountable.cpp b/TAO/tao/Utils/Synch_Refcountable.cpp
index 2b79deb80e0..ff4f6b582d8 100644
--- a/TAO/tao/Utils/Synch_Refcountable.cpp
+++ b/TAO/tao/Utils/Synch_Refcountable.cpp
@@ -10,6 +10,9 @@ ACE_RCSID (Utils,
            Synch_Refcountable,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Synch_Refcountable::TAO_Synch_Refcountable (ACE_Lock *lock,
                                                 int refcount)
   : ACE_Refcountable (refcount)
@@ -22,3 +25,5 @@ TAO_Synch_Refcountable::~TAO_Synch_Refcountable (void)
   ACE_ASSERT (this->refcount_ == 0);
   delete this->refcount_lock_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/Synch_Refcountable.h b/TAO/tao/Utils/Synch_Refcountable.h
index 0e18e9402eb..335a72e7d35 100644
--- a/TAO/tao/Utils/Synch_Refcountable.h
+++ b/TAO/tao/Utils/Synch_Refcountable.h
@@ -1,4 +1,3 @@
-// This may look like C, but it's really
 // -*- C++ -*-
 
 //=============================================================================
@@ -27,6 +26,8 @@
 
 class ACE_Lock;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Synch_Refcountable
  *
@@ -48,6 +49,7 @@ protected:
   ACE_Lock *refcount_lock_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 # include "Synch_Refcountable.inl"
diff --git a/TAO/tao/Utils/Synch_Refcountable.inl b/TAO/tao/Utils/Synch_Refcountable.inl
index 2f4cc32778d..2139918ab50 100644
--- a/TAO/tao/Utils/Synch_Refcountable.inl
+++ b/TAO/tao/Utils/Synch_Refcountable.inl
@@ -1,8 +1,11 @@
 // -*- C++ -*-
+//
 //$Id$
 
 #include "ace/Guard_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 TAO_Synch_Refcountable::increment (void)
 {
@@ -22,3 +25,5 @@ TAO_Synch_Refcountable::refcount (void) const
 {
   return ACE_Refcountable::refcount ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp
index e8f0d633759..2888267e788 100644
--- a/TAO/tao/Valuetype/AbstractBase.cpp
+++ b/TAO/tao/Valuetype/AbstractBase.cpp
@@ -17,6 +17,8 @@ ACE_RCSID (Valuetype,
            AbstractBase,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // ************************************************************
 // These are in CORBA namespace
 
@@ -425,3 +427,5 @@ CORBA::AbstractBase::equivalent_objref (void)
   return this->equivalent_obj_.in ();
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h
index a57c18bf05d..dc8d4657150 100644
--- a/TAO/tao/Valuetype/AbstractBase.h
+++ b/TAO/tao/Valuetype/AbstractBase.h
@@ -29,6 +29,8 @@
 #include "tao/Pseudo_VarOut_T.h"
 #include "ace/CORBA_macros.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Stub;
 class TAO_Abstract_ServantBase;
 
@@ -165,6 +167,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "AbstractBase.inl"
 #endif /* __ACE_INLINE__) */
diff --git a/TAO/tao/Valuetype/AbstractBase.inl b/TAO/tao/Valuetype/AbstractBase.inl
index 8bc52ccfce3..a983ded4ec8 100644
--- a/TAO/tao/Valuetype/AbstractBase.inl
+++ b/TAO/tao/Valuetype/AbstractBase.inl
@@ -4,6 +4,8 @@
 
 #include "ace/OS_NS_string.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 CORBA::AbstractBase_ptr
 CORBA::AbstractBase::_nil (void)
@@ -52,3 +54,5 @@ CORBA::AbstractBase::_is_local (void) const
 {
   return this->is_local_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
index fc1ea235c85..c2a9ad11b5d 100644
--- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
+++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
@@ -6,6 +6,8 @@ ACE_RCSID (Valuetype,
            AbstractBase_Invocation_Adapter,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   AbstractBase_Invocation_Adapter::AbstractBase_Invocation_Adapter (
@@ -28,3 +30,5 @@ namespace TAO
   {
   }
 } // End namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
index 4bae8c0f754..a65447d502a 100644
--- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
+++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
@@ -21,6 +21,8 @@
 
 #include "tao/Invocation_Adapter.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class AbstractBase;
@@ -60,11 +62,12 @@ namespace TAO
     // Disallow copying and assignment.
     AbstractBase_Invocation_Adapter (const AbstractBase_Invocation_Adapter &);
     AbstractBase_Invocation_Adapter & operator= (
-	const AbstractBase_Invocation_Adapter &);
+        const AbstractBase_Invocation_Adapter &);
 
   };
 } // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/Valuetype/AbstractBase_T.cpp b/TAO/tao/Valuetype/AbstractBase_T.cpp
index 03308da8ae6..ca45e9b4782 100644
--- a/TAO/tao/Valuetype/AbstractBase_T.cpp
+++ b/TAO/tao/Valuetype/AbstractBase_T.cpp
@@ -1,14 +1,14 @@
 // $Id$
-#ifndef TAO_ABSTRACT_BASE_T_C
-#define TAO_ABSTRACT_BASE_T_C
+
+#ifndef TAO_ABSTRACT_BASE_T_CPP
+#define TAO_ABSTRACT_BASE_T_CPP
 
 #include "AbstractBase_T.h"
 #include "AbstractBase.h"
 #include "tao/Stub.h"
 
-ACE_RCSID (Valuetype,
-           Abstractbase_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   template<typename T> T *
@@ -102,6 +102,7 @@ namespace TAO
                              collocated ? 1 : 0,
                              obj->_servant ()),
                           CORBA::NO_MEMORY ());
+        ACE_CHECK_RETURN (proxy);
       }
     else
       {
@@ -113,4 +114,6 @@ namespace TAO
   }
 }
 
-#endif /*TAO_ABSTRACT_BASE_T_C*/
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif  /* TAO_ABSTRACT_BASE_T_CPP */
diff --git a/TAO/tao/Valuetype/AbstractBase_T.h b/TAO/tao/Valuetype/AbstractBase_T.h
index e7ec925f828..d2533d87f88 100644
--- a/TAO/tao/Valuetype/AbstractBase_T.h
+++ b/TAO/tao/Valuetype/AbstractBase_T.h
@@ -20,6 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class AbstractBase;
@@ -49,6 +51,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "AbstractBase_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/tao/Valuetype/Sequence_T.cpp b/TAO/tao/Valuetype/Sequence_T.cpp
index a7c0b243a3b..3568ff0ecb5 100644
--- a/TAO/tao/Valuetype/Sequence_T.cpp
+++ b/TAO/tao/Valuetype/Sequence_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_VALUETYPE_SEQUENCE_T_C
-#define TAO_VALUETYPE_SEQUENCE_T_C
+#ifndef TAO_VALUETYPE_SEQUENCE_T_CPP
+#define TAO_VALUETYPE_SEQUENCE_T_CPP
 
 #include "Sequence_T.h"
 
@@ -13,6 +13,9 @@ ACE_RCSID (Valuetype,
            Sequence_T,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // *************************************************************
 // class TAO_Valuetype_Manager
 // *************************************************************
@@ -496,4 +499,6 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::_shrink_buffer (
     }
 }
 
-#endif /* TAO_VALUETYPE_SEQUENCE_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_VALUETYPE_SEQUENCE_T_CPP */
diff --git a/TAO/tao/Valuetype/Sequence_T.h b/TAO/tao/Valuetype/Sequence_T.h
index 47e9a8274ef..b01b9d80673 100644
--- a/TAO/tao/Valuetype/Sequence_T.h
+++ b/TAO/tao/Valuetype/Sequence_T.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename T, typename T_var>
 class TAO_Unbounded_Valuetype_Sequence;
 
@@ -233,6 +235,8 @@ public:
                                CORBA::ULong old_length);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "Sequence_T.inl"
 
diff --git a/TAO/tao/Valuetype/Sequence_T.inl b/TAO/tao/Valuetype/Sequence_T.inl
index 4eb80326837..503beaa3ad9 100644
--- a/TAO/tao/Valuetype/Sequence_T.inl
+++ b/TAO/tao/Valuetype/Sequence_T.inl
@@ -6,6 +6,8 @@
 #include "ace/Log_Msg.h" // for ACE_ASSERT
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // *************************************************************
 // Inline operations for class TAO_Valuetype_Manager
 // *************************************************************
@@ -165,3 +167,5 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator[] (
   T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_);
   return TAO_Valuetype_Manager<T,T_var> (tmp + slot, this->release_);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
index b7496f3e6cb..32c9dfaf932 100644
--- a/TAO/tao/Valuetype/ValueBase.cpp
+++ b/TAO/tao/Valuetype/ValueBase.cpp
@@ -24,6 +24,8 @@ ACE_RCSID (Valuetype,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Static operations in namespace CORBA.
 
 void
@@ -609,3 +611,5 @@ namespace TAO
     CORBA::remove_ref (p);
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h
index 745bfad5d53..d9d97efcd2b 100644
--- a/TAO/tao/Valuetype/ValueBase.h
+++ b/TAO/tao/Valuetype/ValueBase.h
@@ -41,6 +41,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Valuetype_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class ValueFactoryBase;
@@ -231,7 +233,6 @@ namespace TAO
   {
   };
 
-
   template<>
   struct TAO_Valuetype_Export Value_Traits<CORBA::ValueBase>
   {
@@ -244,6 +245,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "ValueBase.inl"
 #endif /* __ACE_INLINE__*/
diff --git a/TAO/tao/Valuetype/ValueBase.inl b/TAO/tao/Valuetype/ValueBase.inl
index 3b7d66658b5..2d15b4a0d19 100644
--- a/TAO/tao/Valuetype/ValueBase.inl
+++ b/TAO/tao/Valuetype/ValueBase.inl
@@ -4,6 +4,8 @@
 
 // Detection of flags in the CDR Stream
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Boolean
 TAO_OBV_GIOP_Flags::is_null_ref (CORBA::ULong tag)
 {
@@ -69,3 +71,5 @@ TAO_OBV_GIOP_Flags::is_end_tag (CORBA::ULong tag)
 {
   return (0x80000000L < tag);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/ValueFactory.cpp b/TAO/tao/Valuetype/ValueFactory.cpp
index 37a8bf6cb79..9348eca9fa9 100644
--- a/TAO/tao/Valuetype/ValueFactory.cpp
+++ b/TAO/tao/Valuetype/ValueFactory.cpp
@@ -5,6 +5,8 @@ ACE_RCSID (Valuetype,
            ValueFactory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Static operations in namespace CORBA.
 
 void
@@ -81,3 +83,5 @@ namespace TAO
     CORBA::remove_ref (p);
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h
index 678a86be8ac..35becef12cd 100644
--- a/TAO/tao/Valuetype/ValueFactory.h
+++ b/TAO/tao/Valuetype/ValueFactory.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,6 +23,7 @@
 
 #include "Value_VarOut_T.h"
 
+#include "tao/Environment.h"
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
 #include "ace/Synch_Traits.h"
@@ -30,7 +31,8 @@
 #include "ace/Null_Mutex.h"
 #include "ace/CORBA_macros.h"
 #include "ace/Atomic_Op.h"
-#include "tao/Environment.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -93,7 +95,10 @@ namespace TAO
     static void release (CORBA::ValueFactoryBase *);
   };
 }
-// Use this macro for writing code that is independend from
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+// Use this macro for writing code that is independent from
 // the compiler support of covariant return types of pointers to
 // virtual inherited classes.
 // (e.g. in egcs-2.90.29 980515 (egcs-1.0.3 release) its not yet implemented)
diff --git a/TAO/tao/Valuetype/ValueFactory_Map.cpp b/TAO/tao/Valuetype/ValueFactory_Map.cpp
index 520c35c9288..40643500065 100644
--- a/TAO/tao/Valuetype/ValueFactory_Map.cpp
+++ b/TAO/tao/Valuetype/ValueFactory_Map.cpp
@@ -9,6 +9,8 @@ ACE_RCSID (Valuetype,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ValueFactory_Map::TAO_ValueFactory_Map (void)
   : map_ (TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE)
 {
@@ -115,6 +117,8 @@ TAO_ValueFactory_Map::instance (void)
     TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX>::instance ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX> * TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
diff --git a/TAO/tao/Valuetype/ValueFactory_Map.h b/TAO/tao/Valuetype/ValueFactory_Map.h
index 715f41cb3b6..bc1a87c4163 100644
--- a/TAO/tao/Valuetype/ValueFactory_Map.h
+++ b/TAO/tao/Valuetype/ValueFactory_Map.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,6 +27,7 @@
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/RW_Thread_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -90,6 +91,8 @@ private:
  */
 typedef TAO_ValueFactory_Map TAO_VALUEFACTORY_MAP;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_VALUEFACTORY_MAP_H */
diff --git a/TAO/tao/Valuetype/Value_CORBA_methods.h b/TAO/tao/Valuetype/Value_CORBA_methods.h
index e54e1262de7..45cc2e6cf51 100644
--- a/TAO/tao/Valuetype/Value_CORBA_methods.h
+++ b/TAO/tao/Valuetype/Value_CORBA_methods.h
@@ -30,6 +30,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Valuetype_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class ValueBase;
@@ -46,6 +48,8 @@ namespace CORBA
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_VALUETYPE_CORBA_METHODS_H */
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp
index 1640adeabba..49320b51f77 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.cpp
+++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp
@@ -8,6 +8,8 @@
 
 #include <algorithm>  /* For std::swap<>() */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename T>
 void
 TAO::Value_Traits<T>::add_ref (T * p)
@@ -206,4 +208,6 @@ TAO_Value_Out_T<T>::operator-> (void)
   return this->ptr_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_VALUE_VAROUT_T_CPP */
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h
index 9813e89452c..ec1e15ae879 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.h
+++ b/TAO/tao/Valuetype/Value_VarOut_T.h
@@ -23,6 +23,8 @@
 
 #include "tao/varbase.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -119,6 +121,8 @@ private:
   T *& ptr_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Value_VarOut_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
index 279d75c5fc3..31586e27853 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
@@ -12,11 +12,7 @@ ACE_RCSID (Valuetype,
            Valuetype_Adapter_Impl,
            "$Id$")
 
-
-TAO_Valuetype_Adapter_Impl::TAO_Valuetype_Adapter_Impl (void)
-{
-
-}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Valuetype_Adapter_Impl::~TAO_Valuetype_Adapter_Impl (void)
 {
@@ -96,6 +92,8 @@ TAO_Valuetype_Adapter_Impl::Initializer (void)
       );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (
     TAO_Valuetype_Adapter_Impl,
     ACE_TEXT ("Concrete_Valuetype_Adapter"),
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
index a72771e6972..5d63dba2df6 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -39,7 +39,7 @@ class TAO_Valuetype_Export TAO_Valuetype_Adapter_Impl
   : public TAO_Valuetype_Adapter
 {
 public:
-  TAO_Valuetype_Adapter_Impl (void);
+
   virtual ~TAO_Valuetype_Adapter_Impl (void);
 
   virtual CORBA::Object_ptr abstractbase_to_object (
@@ -67,12 +67,14 @@ public:
   static int Initializer (void);
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_Valuetype_Adapter_Impl)
-ACE_FACTORY_DECLARE (TAO_Valuetype, TAO_Valuetype_Adapter_Impl)
-
 static int
 TAO_Requires_Valuetype_Initializer =
   TAO_Valuetype_Adapter_Impl::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_Valuetype_Adapter_Impl)
+ACE_FACTORY_DECLARE (TAO_Valuetype, TAO_Valuetype_Adapter_Impl)
+
 #include /**/ "ace/post.h"
 #endif /* TAO_VALUETYPE_ADAPTER_IMPL_H */
author	Ossama Othman <ossama-othman@users.noreply.github.com>	2005-11-04 18:39:05 +0000
committer	Ossama Othman <ossama-othman@users.noreply.github.com>	2005-11-04 18:39:05 +0000
commit	c633e538747abb02b61dcea041ac1a6faa6accd7 (patch)
tree	d31fd7c07cc84da23911a1402b9807afeebd85b2 /TAO/tao
parent	e7dcb66360c346d9d7ec631de64873cf5b30ebad (diff)
download	ATCD-c633e538747abb02b61dcea041ac1a6faa6accd7.tar.gz