ChangeLogTag:Mon Nov 14 13:54:08 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

87 files changed, 376 insertions, 102 deletions

diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
index 322ebb548b8..8da2b64f743 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
@@ -18,6 +18,8 @@ ACE_RCSID (PortableGroup,
 
 #include "ace/Auto_Ptr.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 PortableServer::ObjectId *
 TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref
                                   ACE_ENV_ARG_DECL)
@@ -705,3 +707,5 @@ TAO_GOA::associate_group_with_ref (
   ACE_CHECK;
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
index 66cd21907bb..dd869cc7c33 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
@@ -33,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Profile;
 class TAO_PortableGroup_Acceptor_Registry;
 
@@ -314,6 +316,8 @@ protected:
                        PortableGroup::NotAGroupObject));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
index 8148eff7164..ca6f4bdd882 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
@@ -8,6 +8,8 @@ ACE_RCSID (PortableGroup,
            UIPMC_Factory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /*static*/ int
@@ -23,3 +25,5 @@ namespace TAO
       ace_svc_desc_TAO_UIPMC_Protocol_Factory);
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
index 755901ffff3..3ca193916d0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
@@ -19,6 +19,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -35,5 +39,7 @@ namespace TAO
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /*TAO_MIOP_H*/
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
index eefa86f14c7..361651d0487 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
@@ -7,6 +7,8 @@ ACE_RCSID (PortableGroup,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PG_Default_Property_Validator::TAO_PG_Default_Property_Validator (void)
   : membership_ (1),
     factories_ (1)
@@ -145,3 +147,5 @@ TAO_PG_Default_Property_Validator::validate_criteria (
       ACE_THROW (PortableGroup::InvalidCriteria (invalid_criteria));
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
index da03189be1b..96457ed6b2d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
@@ -22,6 +22,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_PG_Default_Property_Validator
@@ -78,6 +79,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_PG_PROPERTY_VALIDATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index e3b4b621841..7df26bf8241 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -12,6 +12,8 @@
 #include "tao/PortableServer/POAManagerC.h"
 #include "PG_Operators.h" // operator == on CosNaming::Name
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Use this macro at the beginning of CORBA methods
 // to aid in debugging.
 #define METHOD_ENTRY(name)            \
@@ -726,3 +728,5 @@ int TAO::PG_FactoryRegistry::write_ior_file(const char * outputFile, const char
   }
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
index 3f9ae599e2b..0eed6f21d92 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_FactoryRegistry.h
@@ -21,6 +22,10 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //////////////////////////////////
 // Classes declared in this header
 namespace TAO
@@ -46,7 +51,8 @@ namespace TAO
    * Note FactoryRegistry is not part of the OMG standard.  It was added
    * as part of the TAO implementation of Fault Tolerant CORBA
    */
-  class TAO_PortableGroup_Export PG_FactoryRegistry : public virtual POA_PortableGroup::FactoryRegistry
+  class TAO_PortableGroup_Export PG_FactoryRegistry
+    : public virtual POA_PortableGroup::FactoryRegistry
   {
     struct RoleInfo
     {
@@ -250,6 +256,8 @@ namespace TAO
   };
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif // TAO_PG_FACTORYREGISTRY_H_
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.cpp
deleted file mode 100644
index c731d88453f..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- C++ -*-
-
-#include "PG_Factory_Map.h"
-
-
-ACE_RCSID (PortableGroup,
-           PG_Factory_Map,
-           "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h
index ff2033929ff..cbd367cb4ff 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h
@@ -29,6 +29,8 @@
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Factory hash map.
 typedef ACE_Hash_Map_Manager_Ex<
   ACE_UINT32,
@@ -37,6 +39,8 @@ typedef ACE_Hash_Map_Manager_Ex<
   ACE_Equal_To<ACE_UINT32>,
   ACE_Null_Mutex> TAO_PG_Factory_Map;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_PG_FACTORY_MAP_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.cpp
deleted file mode 100644
index e986c8d6cfc..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "PG_Factory_Set.h"
-
-ACE_RCSID (PortableGroup,
-           PG_Factory_Set,
-           "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h
index 3bca619031f..9b545e49831 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h
@@ -26,6 +26,7 @@
 
 #include "ace/Array_Base.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_PG_Factory_Node
@@ -50,6 +51,7 @@ struct TAO_PG_Factory_Node
 
 typedef ACE_Array_Base<TAO_PG_Factory_Node> TAO_PG_Factory_Set;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
index 1a9c5f8b23f..f0f3de9d9bc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
@@ -13,6 +13,9 @@ ACE_RCSID (PortableGroup,
            PG_GenericFactory,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PG_GenericFactory::TAO_PG_GenericFactory (
   TAO_PG_ObjectGroupManager & object_group_manager,
   TAO_PG_PropertyManager & property_manager)
@@ -773,3 +776,5 @@ TAO_PG_GenericFactory::create_member (
 
   return fcid._retn ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
index 8123d3d3828..72115e812e0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
@@ -28,6 +28,7 @@
 #include "orbsvcs/PortableGroupC.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Forward declarations.
 class TAO_PG_ObjectGroupManager;
@@ -240,6 +241,7 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
index bd6af066385..022f1649c75 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
@@ -22,6 +22,8 @@ ACE_RCSID (PortableGroup,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::PG_Group_Factory::PG_Group_Factory ()
   : orb_ (CORBA::ORB::_nil())
   , poa_ (PortableServer::POA::_nil())
@@ -226,3 +228,5 @@ TAO::PG_Group_Factory::groups_at_location (
   result->length (group_count);
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
index 9ef00e3d20a..23bb431a92c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
@@ -30,6 +30,9 @@
 #include "ace/ACE.h"
 #include "ace/Hash_Map_Manager.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //////////////////
 // Forward reference
 namespace TAO
@@ -37,8 +40,6 @@ namespace TAO
   class PG_Property_Set;
 } // namespace TAO_PG
 
-
-
 namespace TAO
 {
   /////////////////////
@@ -176,6 +177,8 @@ namespace TAO
   };
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_PG_GROUP_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
index 7a7c359da50..041f605bb85 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
@@ -9,6 +9,8 @@ ACE_RCSID (PortableGroup,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PG_Group_Guard::TAO_PG_Group_Guard (
   TAO_PG_GenericFactory & generic_factory,
   TAO_PG_Factory_Set & factory_set,
@@ -54,3 +56,4 @@ TAO_PG_Group_Guard::release (void)
   this->released_ = 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
index 8fd7d844619..3c0d719f243 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
@@ -26,13 +26,12 @@
 
 #include "tao/PortableServer/PortableServerC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Forward declarations.
 class TAO_PG_GenericFactory;
 class TAO_PG_ObjectGroupManager;
 
-
-
 /**
  * @class TAO_PG_Group_Guard
  *
@@ -87,6 +86,7 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h
index 224daf9c011..7d7014f5437 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h
@@ -26,6 +26,7 @@
 #include "portablegroup_export.h"
 #include "orbsvcs/PortableGroupC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_PG_Location_Equal_To
@@ -47,6 +48,7 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "PG_Location_Equal_To.inl"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl
index 2c9ab16375a..052d968242b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 TAO_PG_Location_Equal_To::operator () (
   const PortableGroup::Location &lhs,
@@ -9,3 +11,5 @@ TAO_PG_Location_Equal_To::operator () (
 {
   return lhs == rhs;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h
index 105ef25e6db..f39d7b72f7e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h
@@ -26,6 +26,8 @@
 #include "orbsvcs/PortableGroupC.h"
 #include "ace/ACE.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_PG_Location_Hash
  *
@@ -40,6 +42,7 @@ public:
   CORBA::ULong operator() (const PortableGroup::Location &) const;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "PG_Location_Hash.inl"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl
index 41fe3d62519..a0b591b1068 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::ULong
 TAO_PG_Location_Hash::operator() (
   const PortableGroup::Location &location) const
@@ -19,3 +21,5 @@ TAO_PG_Location_Hash::operator() (
 
   return hash;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.cpp
deleted file mode 100644
index 0ff336e3c93..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- C++ -*-
-
-#include "PG_Location_Map.h"
-
-ACE_RCSID (PortableGroup,
-           PG_Location_Map,
-           "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h
index 6786897aa0f..44df85af5f0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h
@@ -31,6 +31,8 @@
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Forward declarations.
 struct TAO_PG_ObjectGroup_Map_Entry;
 
@@ -45,6 +47,8 @@ typedef ACE_Hash_Map_Manager_Ex<
   TAO_PG_Location_Equal_To,
   ACE_Null_Mutex> TAO_PG_Location_Map;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_PG_LOCATION_MAP_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
index 8746e2958ff..791ca59e531 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
@@ -5,6 +5,7 @@ ACE_RCSID (PortableGroup,
            PG_MemberInfo,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
 TAO_PG_MemberInfo::operator== (const TAO_PG_MemberInfo & rhs)
@@ -13,3 +14,5 @@ TAO_PG_MemberInfo::operator== (const TAO_PG_MemberInfo & rhs)
   // important.
   return location == rhs.location;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h
index 919c58f7ca5..41d428bd0bb 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h
@@ -25,6 +25,8 @@
 #include "orbsvcs/PortableGroupC.h"
 #include "ace/Unbounded_Set.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_PG_MemberInfo
  *
@@ -51,9 +53,9 @@ struct TAO_PG_MemberInfo
 
 };
 
-
 typedef ACE_Unbounded_Set<TAO_PG_MemberInfo> TAO_PG_MemberInfo_Set;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
index ef9eb998bb8..71e7d62a7f6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
@@ -5,6 +5,7 @@ ACE_RCSID (PortableGroup,
            PG_Null_Property_Validator,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_PG_Null_Property_Validator::validate_property (
@@ -25,3 +26,5 @@ TAO_PG_Null_Property_Validator::validate_criteria (
                    PortableGroup::CannotMeetCriteria))
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
index 573430ccf66..7498b80d110 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
@@ -23,6 +23,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_PG_Null_Property_Validator
  *
@@ -58,6 +60,8 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_PG_PROPERTY_VALIDATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index 5152cdac17c..d80c190e564 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -14,6 +14,8 @@ ACE_RCSID (PortableGroup,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PG_ObjectGroupManager::TAO_PG_ObjectGroupManager (void)
   : poa_ (),
     object_group_map_ (TAO_PG_MAX_OBJECT_GROUPS),
@@ -865,3 +867,5 @@ TAO_PG_ObjectGroupManager::generic_factory (
 {
   this->generic_factory_ = generic_factory;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
index 962a9a1232a..c7a3c4a9fd9 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
@@ -30,6 +30,8 @@
 #include "tao/PortableServer/PortableServerC.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Forward declarations
 class TAO_PG_GenericFactory;
 
@@ -305,6 +307,7 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp
deleted file mode 100644
index 75e6324bce6..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "PG_ObjectGroup_Map.h"
-
-ACE_RCSID (PortableGroup,
-           PG_ObjectGroup_Map,
-           "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h
index b754df541a2..b7cd89c309b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h
@@ -32,6 +32,8 @@
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_PG_ObjectGroup_Map_Entry
  *
@@ -75,6 +77,7 @@ typedef ACE_Hash_Map_Manager_Ex<
   ACE_Equal_To<PortableServer::ObjectId>,
   ACE_Null_Mutex> TAO_PG_ObjectGroup_Map;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
index 9cdce730ed6..38ae410781b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
@@ -10,6 +10,7 @@ ACE_RCSID (TAO_PortableGroup,
            PG_Object_Adapter_Factory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PG_Object_Adapter_Factory::TAO_PG_Object_Adapter_Factory (void)
 {
@@ -36,6 +37,8 @@ TAO_PG_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
   return object_adapter;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_PortableGroup, TAO_PG_Object_Adapter_Factory)
 ACE_STATIC_SVC_DEFINE (TAO_PG_Object_Adapter_Factory,
                        ACE_TEXT ("TAO_GOA"),
@@ -43,4 +46,3 @@ ACE_STATIC_SVC_DEFINE (TAO_PG_Object_Adapter_Factory,
                        &ACE_SVC_NAME (TAO_PG_Object_Adapter_Factory),
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
-
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h
index 189d77873a8..c7367fbe3fa 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_Object_Adapter_Factory.h
@@ -24,6 +25,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_PortableGroup_Export TAO_PG_Object_Adapter_Factory : public TAO_Object_Adapter_Factory
 {
 public:
@@ -34,6 +37,8 @@ public:
   virtual TAO_Adapter *create (TAO_ORB_Core *orb_core);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_PG_Object_Adapter_Factory)
 ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PG_Object_Adapter_Factory)
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index e61dd872186..cc977348a1d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -27,6 +27,7 @@
 #define TODO int todo;
 //#define TODO
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::PG_Object_Group::MemberInfo::MemberInfo (
     CORBA::Object_ptr member,
@@ -886,6 +887,8 @@ TAO::PG_Object_Group::has_member_at (const PortableGroup::Location & location)
   return (0 == this->members_.find (location));
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // Restore original compiler flags.
 #if defined (__BORLANDC__) && (__BORLANDC__ <= 0x564)
 # pragma option pop
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
index 09f8ebba42c..61606a2548c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_Object_Group.h
@@ -38,6 +39,8 @@
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/ACE.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /////////////////////
 // Forward references
 
@@ -372,6 +375,8 @@ namespace TAO
   };
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif // TAO_PG_OBJECT_GROUP_H_
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
index d55a858f22c..6b55e12e309 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
@@ -20,6 +20,9 @@ ACE_RCSID (PortableGroup,
            PG_Object_Group_Manipulator,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::PG_Object_Group_Manipulator::PG_Object_Group_Manipulator ()
   : orb_ (CORBA::ORB::_nil ())
   , poa_ (PortableServer::POA::_nil ())
@@ -183,3 +186,5 @@ void dump_membership (const char * label, PortableGroup::ObjectGroup_ptr member)
   }
 #endif
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
index 881a7437ade..85f734f442c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
@@ -26,6 +26,8 @@
 
 #include "tao/IORManipulation/IORManip_Loader.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -114,6 +116,7 @@ namespace TAO
   };
 } //namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
index 99436d883a5..4e16737bc2f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
@@ -5,6 +5,8 @@ ACE_RCSID (PortableGroup,
            PG_Operators,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 bool
 operator== (const CosNaming::Name & lhs, const CosNaming::Name & rhs)
 {
@@ -27,3 +29,5 @@ operator!= (const CosNaming::Name & lhs, const CosNaming::Name & rhs)
 {
   return !(lhs == rhs);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h
index 881c5330403..b6d7097b7e9 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h
@@ -25,6 +25,8 @@
 
 #include "orbsvcs/CosNamingC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Global CosNaming::Name equality operator.
 /**
  * Used for checking equality of PortableGroup::Location and
@@ -41,6 +43,7 @@ bool TAO_PortableGroup_Export operator== (const CosNaming::Name & lhs,
 bool TAO_PortableGroup_Export operator!= (const CosNaming::Name & lhs,
                                           const CosNaming::Name & rhs);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp
index 5dc23baa0a8..8e3f140b8a4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    PG_Properties_Encoder.cpp
@@ -18,6 +17,8 @@
 #include "PG_Properties_Encoder.inl"
 #endif /* !  __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //////////
 // Properties_Encoder
 TAO_PG::Properties_Encoder::Properties_Encoder ()
@@ -62,3 +63,5 @@ void TAO_PG::Properties_Encoder::encode (
     // nc.kind defaults to empty.  Leave it that way (for now)
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
index d171ec5590a..92736c4f28f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_Properties_Encoder.h
@@ -26,6 +27,8 @@
 #include "ace/Vector_T.h"
 #include "ace/SString.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_PG
 {
   /**
@@ -89,6 +92,8 @@ namespace TAO_PG
 
 } //namespace TAO_PG
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "PG_Properties_Encoder.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl
index 17fadf5df67..aa64246f6a5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_Properties_Encoder.inl
@@ -8,6 +9,9 @@
  *  @author Dale Wilson <wilson_d@ociweb.com>
  */
 //=============================================================================
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_PG
 {
   ACE_INLINE
@@ -57,3 +61,4 @@ namespace TAO_PG
 
 } //namespace TAO_PG
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
index 907c2959ae2..49235842db3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_Properties_Support.cpp
@@ -13,6 +14,8 @@
 
 #include "PG_Properties_Support.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::PG_Properties_Support::PG_Properties_Support ()
 {
 }
@@ -144,3 +147,5 @@ TAO::PG_Properties_Support::find_typeid_properties (
   }
   return typeid_properties;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
index a56bbc9a168..c49f5990c5b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_Properties_Support.h
@@ -20,6 +21,8 @@
 #include "PG_Property_Set.h"
 #include "portablegroup_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -206,4 +209,6 @@ namespace TAO
   };
 } //namespace TAO_PG
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif // TAO_PG_PROPERTIES_SUPPORT_H
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
index b09dc33d9de..57ca310be82 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
@@ -12,6 +12,8 @@ ACE_RCSID (PortableGroup,
            PG_PropertyManager,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PG_PropertyManager::TAO_PG_PropertyManager (
   TAO_PG_ObjectGroupManager & object_group_manager)
   : object_group_manager_ (object_group_manager),
@@ -362,3 +364,5 @@ TAO_PG_PropertyManager::remove_properties (
   // variable.
   properties = new_properties;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
index 7b748ac0d15..7fe33a7f00c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
@@ -30,6 +30,8 @@
 #include "ace/Functor.h"
 #include "ace/Hash_Map_Manager_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Forward declarations.
 class TAO_PG_ObjectGroupManager;
 
@@ -183,6 +185,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_PG_PROPERTY_MANAGER_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
index 8e41ae574ca..82f8af77782 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    PG_Property_Set.cpp
@@ -17,6 +16,8 @@
 #include "PG_Property_Set.h"
 #include "tao/debug.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //////////////////////
 // PG_Property_Set
 
@@ -25,7 +26,6 @@ TAO::PG_Property_Set::PG_Property_Set()
 {
 }
 
-
 TAO::PG_Property_Set::PG_Property_Set (
   const PortableGroup::Properties & property_set
     ACE_ENV_ARG_DECL)
@@ -351,3 +351,5 @@ int TAO_PG::test_encode_decode ()
   return result;
 }
 #endif // PG_PS_UNIT_TEST
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
index 05c5f57f34b..043e7644b95 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_Property_Set.h
@@ -27,6 +28,8 @@
 #include "ace/SString.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -186,6 +189,8 @@ namespace TAO
 #endif // PG_PS_UNIT_TEST
 } //namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ////////////////////////////////////
 // include templated helper function
 #include "PG_Property_Set_Find.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h
index b06794df571..9b28b1fc4ed 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_Property_Set_Find.h
@@ -24,6 +25,8 @@
 
 #include "ace/Hash_Map_Manager.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -45,6 +48,8 @@ namespace TAO
 
 } //namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif // TAO_PG_PROPERTY_SET_FIND_H
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
index 895c5bc8ad3..49a4e08bfde 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
@@ -5,6 +5,8 @@ ACE_RCSID (PortableGroup,
            PG_Property_Utils,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Boolean
 TAO_PG::get_property_value (const PortableGroup::Name & property_name,
                             const PortableGroup::Properties & properties,
@@ -76,3 +78,5 @@ TAO_PG::override_properties (
         }
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
index ca02b71a413..b7404c53c41 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
@@ -25,6 +25,7 @@
 #include "portablegroup_export.h"
 #include "orbsvcs/PortableGroupC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_PG
 {
@@ -50,5 +51,7 @@ namespace TAO_PG
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /* TAO_PG_PROPERTY_UTILS_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
index 78280b2e7af..acdaa982a50 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
@@ -1,4 +1,4 @@
-// @(#) $Id$
+// $Id$
 
 #include "GOA.h"
 #include "PG_Servant_Dispatcher.h"
@@ -7,6 +7,8 @@ ACE_RCSID(PortableGroup,
           PG_Servant_Dispatcher,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PG_Servant_Dispatcher::~TAO_PG_Servant_Dispatcher (void)
 {
 }
@@ -40,24 +42,29 @@ TAO_PG_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
 }
 
 void
-TAO_PG_Servant_Dispatcher::pre_invoke_remote_request (TAO_Root_POA &,
-                                                      CORBA::Short,
-                                                      TAO_ServerRequest &,
-                                                      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
-                                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_PG_Servant_Dispatcher::pre_invoke_remote_request (
+  TAO_Root_POA &,
+  CORBA::Short,
+  TAO_ServerRequest &,
+  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
+  ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_PG_Servant_Dispatcher::pre_invoke_collocated_request (TAO_Root_POA &,
-                                                          CORBA::Short,
-                                                          TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
-                                                          ACE_ENV_ARG_DECL_NOT_USED)
+TAO_PG_Servant_Dispatcher::pre_invoke_collocated_request (
+  TAO_Root_POA &,
+  CORBA::Short,
+  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
+  ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_PG_Servant_Dispatcher::post_invoke (TAO_Root_POA &,
-                                        TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &)
+TAO_PG_Servant_Dispatcher::post_invoke (
+  TAO_Root_POA &,
+  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
index 2c40bef8cd3..ed26a3b980a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_PG_Servant_Dispatcher
  *
@@ -64,5 +66,7 @@ public:
                                  ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PG_SERVANT_DISPATCHER_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
index 58047cef329..988e0eff5dc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
@@ -13,6 +13,7 @@ ACE_RCSID (PortableGroup,
            PG_Utils,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -171,3 +172,5 @@ namespace TAO
     return cdr.good_bit ();
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h
index f919cbbbba6..cd9af20cab9 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_Utils.h
@@ -22,6 +23,8 @@
 
 #include "portablegroup_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -50,7 +53,7 @@ namespace TAO
   };
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /*TAO_PORTABLEGROUP_UTILS_H*/
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h
index dcb0e3d5a5e..7f993ad8f71 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h
@@ -24,6 +24,8 @@
 
 #include "orbsvcs/PortableGroupC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #ifndef TAO_PG_MAX_OBJECT_GROUPS  // @@ why create arbitrary limits?
 /// The maximum number of object groups to be managed by the
 /// ObjectGroupManager.  This number is also equal to the number of
@@ -55,6 +57,8 @@ const PortableGroup::MinimumNumberMembersValue TAO_PG_MINIMUM_NUMBER_MEMBERS =
   TAO_PG_INITIAL_NUMBER_MEMBERS;
 #endif  /* TAO_PG_MINIMUM_NUMBER_MEMBERS */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_PG_CONF_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
index 9f09c2ebf34..fb657e5e881 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
 #include "PortableGroup_Acceptor_Registry.h"
@@ -16,6 +14,8 @@ ACE_RCSID (PortableGroup,
            PortableGroup_Acceptor_Registry,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PortableGroup_Acceptor_Registry::TAO_PortableGroup_Acceptor_Registry (void)
 {
 }
@@ -187,3 +187,5 @@ TAO_PortableGroup_Acceptor_Registry::find (const TAO_Profile* profile,
 
    return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
index 96262fb3835..4b8a1c87c15 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
@@ -30,6 +30,8 @@
 #include "tao/Transport_Acceptor.h"
 #include "tao/Resource_Factory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Profile;
 
 namespace CORBA
@@ -108,10 +110,8 @@ private:
   Acceptor_Registry registry_;
 };
 
-//#if defined(__ACE_INLINE__)
-//#include "tao/PortableGroup_Acceptor_Registry.i"
-//#endif /* __ACE_INLINE__ */
-
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
+
 #endif /* TAO_PORTABLEGROUP_ACCEPTOR_REGISTRY_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
index 31e3782daeb..b2fb4c1aaf4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
 #include "PortableGroup_Loader.h"
@@ -13,6 +11,9 @@ ACE_RCSID (PortableGroup,
            PortableGroup_Loader,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PortableGroup_Loader::TAO_PortableGroup_Loader (void)
 {
 }
@@ -71,6 +72,8 @@ TAO_PortableGroup_Loader::Initializer (void)
   return -1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_PortableGroup_Loader,
                        ACE_TEXT ("PortableGroup_Loader"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
index c30fa026c6b..6f67d8b8286 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
@@ -16,15 +16,20 @@
 #define TAO_PORTABLEGROUP_LOADER_H
 
 #include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
+
+#include "portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+#include "ace/Service_Config.h"
 #include "ace/Service_Object.h"
 
-#include "portablegroup_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_PortableGroup_Adapter
@@ -49,13 +54,15 @@ public:
   static int Initializer (void);
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_PortableGroup_Loader)
-ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PortableGroup_Loader)
-
 static int
 TAO_Requires_PortableGroup_Initializer =
   TAO_PortableGroup_Loader::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_PortableGroup_Loader)
+ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PortableGroup_Loader)
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_PORTABLEGROUP_LOADER_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
index 29cace33f28..6ba92af8454 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
@@ -16,6 +16,8 @@ static const char pg_poa_factory_name[] = "TAO_PG_POA";
 static const char pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
   "TAO_PG_POA", "TAO_PortableGroup", "_make_TAO_PG_Object_Adapter_Factory", "");
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO_PortableGroup_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr info
@@ -65,3 +67,5 @@ TAO_PortableGroup_ORBInitializer::post_init (
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
index 901e76e68d3..fa27eb6df7c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
@@ -32,6 +32,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// PortableGroup ORB initializer.
 class TAO_PortableGroup_Export TAO_PortableGroup_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
@@ -48,6 +50,8 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
index 3fb03e3841d..73c78597e50 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
 #include "UIPMC_Profile.h"
@@ -13,6 +11,8 @@ ACE_RCSID (PortableGroup,
            PortableGroup_Request_Dispatcher,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 PortableGroup_Request_Dispatcher::~PortableGroup_Request_Dispatcher (void)
 {
 }
@@ -57,3 +57,5 @@ PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core,
                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
index 0f0ae518206..11b2450218f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
@@ -24,6 +24,8 @@
 #include "Portable_Group_Map.h"
 #include "PortableGroup_Acceptor_Registry.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 class TAO_PortableGroup_Loader;
 
@@ -61,6 +63,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_PORTABLEGROUP_REQUEST_DISPATCHER_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
index c970a53bbee..631ae66e906 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
@@ -9,6 +9,7 @@ ACE_RCSID (PortableGroup,
            Portable_Group_Map,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Constructor.
 TAO_Portable_Group_Map::TAO_Portable_Group_Map ()
@@ -175,3 +176,5 @@ TAO_GroupId_Equal_To::operator () (
     && lhs->object_group_id == rhs->object_group_id
     && lhs->object_group_ref_version == rhs->object_group_ref_version;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
index 12ec9ee45a5..898e3663ff9 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
@@ -28,6 +28,7 @@
 #include "ace/Null_Mutex.h"
 #include "ace/Hash_Map_Manager_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ServerRequest;
 
@@ -128,6 +129,8 @@ protected:
   GroupId_Table map_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 //#if defined (__ACE_INLINE__)
 //# include "Portable_Group_Map.i"
 //#endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
index a6b2bf50b8e..28162b3fded 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
@@ -22,6 +22,7 @@ ACE_RCSID (PortableGroup,
            UIPMC_Acceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIPMC_Acceptor::TAO_UIPMC_Acceptor (CORBA::Boolean /*flag*/)
   : TAO_Acceptor (TAO_TAG_UIPMC_PROFILE),
@@ -347,3 +348,5 @@ TAO_UIPMC_Acceptor::parse_options (const char *str)
     }
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
index 4022d3f4ec0..371feec959b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
@@ -32,6 +32,8 @@
 
 #include "portablegroup_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO UIPMC_Acceptor concrete call defination
 
 /**
@@ -148,6 +150,8 @@ private:
   TAO_UIPMC_Connection_Handler *connection_handler_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
 #include "UIPMC_Acceptor.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i
index 3bda9ea1fca..ec296d0f9b6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i
@@ -1,6 +1,10 @@
 // -*- C++ -*-
+//
 // $Id$
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const ACE_INET_Addr&
 TAO_UIPMC_Acceptor::address (void) const
 {
@@ -21,3 +25,5 @@ TAO_UIPMC_Acceptor::endpoints (void)
 
   return this->addrs_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
index 930e364b656..db49307c2b7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
@@ -23,6 +23,7 @@ ACE_RCSID(PortableGroup,
           UIPMC_Connection_Handler,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIPMC_Connection_Handler::TAO_UIPMC_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_UIPMC_SVC_HANDLER (t, 0 , 0),
@@ -262,3 +263,5 @@ TAO_UIPMC_Connection_Handler::add_transport_to_cache (void)
           .transport_cache ().cache_transport (&prop,
                                                this->transport ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
index 0ea83fc2966..af548309afb 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
@@ -32,6 +32,8 @@
 #include "ace/SOCK_Dgram.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward Decls
 class TAO_Pluggable_Messaging;
 
@@ -45,8 +47,6 @@ class TAO_Pluggable_Messaging;
  * The Connection handler which is common for the Acceptor and
  * the Connector
  */
-
-
 class TAO_PortableGroup_Export TAO_UIPMC_Connection_Handler :
   public TAO_UIPMC_SVC_HANDLER,
   public TAO_Connection_Handler
@@ -143,5 +143,7 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_UIPMC_CONNECTION_HANDLER_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index 370ff9fd142..d6d74ed8e6c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
 #include "UIPMC_Profile.h"
@@ -14,9 +12,11 @@
 #include "ace/Connector.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (tao,
+ACE_RCSID (PortableGroup,
            UIPMC_Connector, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UIPMC_Connector::TAO_UIPMC_Connector (CORBA::Boolean)
   : TAO_Connector (TAO_TAG_UIPMC_PROFILE)
 {
@@ -181,15 +181,15 @@ TAO_UIPMC_Connector::check_prefix (const char *endpoint)
   if (!endpoint || !*endpoint)
     return -1;  // Failure
 
-  const char *protocol[] = { "miop" };
+  static const char protocol[] = "miop";
+  static size_t const len = sizeof (protocol);
 
-  size_t slot = ACE_OS::strchr (endpoint, ':') - endpoint;
-  size_t len0 = ACE_OS::strlen (protocol[0]);
+  size_t const slot = ACE_OS::strchr (endpoint, ':') - endpoint;
 
   // Check for the proper prefix in the IOR.  If the proper prefix
   // isn't in the IOR then it is not an IOR we can use.
-  if (slot == len0
-      && ACE_OS::strncasecmp (endpoint, protocol[0], len0) == 0)
+  if (slot == len
+      && ACE_OS::strncasecmp (endpoint, protocol, len) == 0)
     return 0;
 
   return -1;
@@ -205,14 +205,14 @@ TAO_UIPMC_Connector::object_key_delimiter (void) const
 
 int
 TAO_UIPMC_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
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Hash <ACE_INET_Addr>;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
index b537b14a02c..49ef29f33a5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
@@ -28,6 +28,8 @@
 #include "tao/Transport_Connector.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 /**
@@ -90,6 +92,8 @@ private:
     SvcHandlerIterator;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_UIPMC_CONNECTOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
index 04ef32df9ce..ebdc5a5f8df 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
 #include "UIPMC_Endpoint.h"
@@ -20,6 +18,8 @@ ACE_RCSID (tao,
 # include "UIPMC_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UIPMC_Endpoint::TAO_UIPMC_Endpoint (void)
   : TAO_Endpoint (TAO_TAG_UIPMC_PROFILE),
     object_addr_ (),
@@ -145,3 +145,5 @@ TAO_UIPMC_Endpoint::hash (void)
 
   return this->hash_val_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
index f7a23583d58..7988f5e29f7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
@@ -27,6 +27,8 @@
 
 #include "portablegroup_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_UIPMC_Endpoint
  *
@@ -116,6 +118,8 @@ private:
   TAO_UIPMC_Endpoint *next_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "UIPMC_Endpoint.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i
index c89f5618806..7d91cc4d459 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const ACE_INET_Addr &
 TAO_UIPMC_Endpoint::object_addr (void) const
 {
@@ -46,3 +49,4 @@ TAO_UIPMC_Endpoint::update_object_addr (void)
                           this->uint_ip_addr ());
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
index ba2accd9ff2..d899a094059 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
 #include "UIPMC_Factory.h"
@@ -11,7 +9,9 @@ ACE_RCSID (PortableGroup,
            UIPMC_Factory, 
            "$Id$")
 
-static const char prefix_[] = "uipmc";
+static const char the_prefix[] = "uipmc";
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIPMC_Protocol_Factory::TAO_UIPMC_Protocol_Factory (void)
   :  TAO_Protocol_Factory (TAO_TAG_UIPMC_PROFILE),
@@ -28,13 +28,13 @@ int
 TAO_UIPMC_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_UIPMC_Protocol_Factory::prefix (void) const
 {
-  return ::prefix_;
+  return ::the_prefix;
 }
 
 char
@@ -85,6 +85,8 @@ TAO_UIPMC_Protocol_Factory::requires_explicit_endpoint (void) const
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_UIPMC_Protocol_Factory,
                        ACE_TEXT ("UIPMC_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
index 8696202441d..9b64f04ba6c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
@@ -25,6 +25,8 @@
 
 #include "portablegroup_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Acceptor;
 class TAO_Connector;
 
@@ -60,6 +62,8 @@ private:
   int minor_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_UIPMC_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_UIPMC_Protocol_Factory)
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
index 2f8473c5a73..553df62769e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
@@ -2,6 +2,8 @@
 
 #include "UIPMC_Message_Block_Data_Iterator.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 UIPMC_Message_Block_Data_Iterator::UIPMC_Message_Block_Data_Iterator (iovec *iov, int iovcnt) :
   iov_ (iov),
   iovcnt_ (iovcnt),
@@ -83,3 +85,5 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length,
         }
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h
index 3f28eb5e7c6..0378e1aac7c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h
@@ -21,6 +21,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class UIPMC_Message_Block_Data_Iterator
  *
@@ -60,5 +64,7 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /* TAO_UIPMC_MESSAGE_BLOCK_DATA_ITERATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index 8c1cfd4af4f..ee4aa503146 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
 #include "UIPMC_Profile.h"
@@ -19,12 +17,14 @@ ACE_RCSID (PortableGroup,
            UIPMC_Profile,
            "$Id$")
 
-static const char prefix_[] = "uipmc";
+static const char the_prefix[] = "uipmc";
 
 // UIPMC doesn't support object keys, so send profiles by default in the GIOP 1.2 target
 // specification.
 static const CORBA::Short default_addressing_mode_ = TAO_Target_Specification::Profile_Addr;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 const char TAO_UIPMC_Profile::object_key_delimiter_ = '/';
 
 char
@@ -398,7 +398,7 @@ TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // @@ Frank: Update to pull out GroupID information...
 
-  size_t buflen = (ACE_OS::strlen (::prefix_) +
+  size_t buflen = (ACE_OS::strlen (::the_prefix) +
                    3 /* "loc" */ +
                    1 /* colon separator */ +
                    2 /* double-slash separator */ +
@@ -414,7 +414,7 @@ TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
   ACE_OS::sprintf (buf,
                    "corbaloc:%s://1.0@%s:%d",
-                   ::prefix_,
+                   ::the_prefix,
                    this->endpoint_.get_host_addr (),
                    this->endpoint_.port ());
   return buf;
@@ -423,7 +423,7 @@ TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 const char *
 TAO_UIPMC_Profile::prefix (void)
 {
-  return ::prefix_;
+  return ::the_prefix;
 }
 
 IOP::TaggedProfile &
@@ -742,3 +742,5 @@ TAO_UIPMC_Profile::extract_group_component (const IOP::TaggedProfile &profile,
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
index 3b5ee25dc3a..263b6391cef 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
@@ -33,6 +33,7 @@
 
 #include "ace/SString.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO UIPMC_Profile concrete Profile definitions
 /**
@@ -153,5 +154,7 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /* TAO_UIPMC_PROFILE_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
index ea424e9816c..e55f36b7032 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
@@ -1,4 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
 #include "UIPMC_Profile.h"
@@ -59,6 +58,8 @@ ACE_RCSID (PortableGroup,
 
 static const CORBA::Octet miop_magic[4] = { 0x4d, 0x49, 0x4f, 0x50 }; // 'M', 'I', 'O', 'P'
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 struct MIOP_Packet
 {
   iovec iov[ACE_IOV_MAX];
@@ -66,6 +67,7 @@ struct MIOP_Packet
   int length;
 };
 
+
 TAO_UIPMC_Transport::TAO_UIPMC_Transport (TAO_UIPMC_Connection_Handler *handler,
                                           TAO_ORB_Core *orb_core,
                                           CORBA::Boolean /*flag*/)
@@ -586,8 +588,6 @@ TAO_UIPMC_Transport::send_message (TAO_OutputCDR &stream,
   return 1;
 }
 
-
-
 int
 TAO_UIPMC_Transport::messaging_init (CORBA::Octet major,
                                     CORBA::Octet minor)
@@ -596,3 +596,5 @@ TAO_UIPMC_Transport::messaging_init (CORBA::Octet major,
                                  minor);
   return 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
index 164e8991e51..f887f1dfedf 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
@@ -25,6 +25,8 @@
 #include "ace/SOCK_Stream.h"
 #include "ace/Svc_Handler.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decls.
 class TAO_UIPMC_Connection_Handler;
 class TAO_ORB_Core;
@@ -123,5 +125,7 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /* TAO_UIPMC_TRANSPORT_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
index a640656a52a..13b3556e6db 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
@@ -7,6 +7,8 @@
 
 ACE_RCSID(tao, Wait_On_Leader_Follower, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UIPMC_Wait_Never::TAO_UIPMC_Wait_Never (TAO_Transport *transport)
   : TAO_Wait_Strategy (transport)
 {
@@ -47,3 +49,5 @@ TAO_UIPMC_Wait_Never::wait (ACE_Time_Value *,
 {
   return -1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
index 799d09e2e64..fb688c28951 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,6 +23,8 @@
 
 #include "portablegroup_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_UIPMC_Wait_Never
  *
@@ -50,5 +52,7 @@ public:
   virtual bool can_process_upcalls (void) const;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_UIPMC_WAIT_NEVER_H */