1 files changed, 6 insertions, 10 deletions
diff --git a/TAO/tao/Codeset_Manager_Factory_Base.cpp b/TAO/tao/Codeset_Manager_Factory_Base.cpp
index c7361b99079..a4ed7de44d8 100644
--- a/TAO/tao/Codeset_Manager_Factory_Base.cpp
+++ b/TAO/tao/Codeset_Manager_Factory_Base.cpp
@@ -1,27 +1,25 @@
 // $Id$
 
-#include "tao/ORB_Core.h"
-#include "tao/Codeset_Manager.h"
-#include "tao/Codeset_Manager_Factory_Base.h"
+#include "ORB_Core.h"
+#include "Codeset_Manager.h"
+#include "Codeset_Manager_Factory_Base.h"
 
 ACE_RCSID (tao,
            Codeset_Manager_Factory_Base,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_Codeset_Manager_Factory_Base::~TAO_Codeset_Manager_Factory_Base (void)
+TAO_Codeset_Manager_Factory_Base::~TAO_Codeset_Manager_Factory_Base ()
 {
 }
 
 int
-TAO_Codeset_Manager_Factory_Base::is_default (void) const
+TAO_Codeset_Manager_Factory_Base::is_default() const
 {
   return 1;
 }
 
 TAO_Codeset_Manager *
-TAO_Codeset_Manager_Factory_Base::create (void)
+TAO_Codeset_Manager_Factory_Base::create ()
 {
   return 0;
 
@@ -34,8 +32,6 @@ TAO_Codeset_Manager_Factory_Base::initialize (void)
     (ace_svc_desc_TAO_Codeset_Manager_Factory_Base);
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 static int
 TAO_Requires_Codeset_Manager_Factory_Base =
 TAO_Codeset_Manager_Factory_Base::initialize ();