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

6 files changed, 37 insertions, 22 deletions

diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
index 2cf7818721e..ab295537c41 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-//
 // $Id$
 
 #include "CDR_Encaps_Codec.h"
@@ -20,16 +18,18 @@
 #include "ace/OS_NS_string.h"
 
 
-ACE_RCSID (tao,
+ACE_RCSID (CodecFactory,
            CDR_Encaps_Codec,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_CDR_Encaps_Codec::TAO_CDR_Encaps_Codec (CORBA::Octet major,
-                                            CORBA::Octet minor,
-                                            TAO_ORB_Core * orb_core,
-                                            TAO_Codeset_Translator_Base * char_trans,
-                                            TAO_Codeset_Translator_Base * wchar_trans)
+TAO_CDR_Encaps_Codec::TAO_CDR_Encaps_Codec (
+  CORBA::Octet major,
+  CORBA::Octet minor,
+  TAO_ORB_Core * orb_core,
+  TAO_Codeset_Translator_Base * char_trans,
+  TAO_Codeset_Translator_Base * wchar_trans)
   : major_ (major),
     minor_ (minor),
     orb_core_ (orb_core),
@@ -364,3 +364,5 @@ TAO_CDR_Encaps_Codec::check_type_for_encoding (
       && typecode->equivalent (CORBA::_tc_wstring ACE_ENV_ARG_PARAMETER))
     ACE_THROW (IOP::Codec::InvalidTypeForEncoding ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
index 1ea84625b7b..34f530c9e4f 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
@@ -23,6 +23,8 @@
 
 #include "tao/LocalObject.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Codeset_Translator_Base;
 
 /**
@@ -107,9 +109,8 @@ private:
 
   /// Prevent copying through the copy constructor and the assignment
   /// operator.
-  ACE_UNIMPLEMENTED_FUNC (
-    TAO_CDR_Encaps_Codec (const TAO_CDR_Encaps_Codec &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_CDR_Encaps_Codec &))
+  TAO_CDR_Encaps_Codec (const TAO_CDR_Encaps_Codec &);
+  void operator= (const TAO_CDR_Encaps_Codec &);
 
 private:
 
@@ -130,6 +131,8 @@ private:
   TAO_Codeset_Translator_Base * wchar_translator_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_CDR_ENCAPS_CODEC_H */
diff --git a/TAO/tao/CodecFactory/CodecFactory.cpp b/TAO/tao/CodecFactory/CodecFactory.cpp
index 646a88b28a2..ffc42bab5f4 100644
--- a/TAO/tao/CodecFactory/CodecFactory.cpp
+++ b/TAO/tao/CodecFactory/CodecFactory.cpp
@@ -1,5 +1,3 @@
-/* -*- C++ -*- */
-
 // =================================================================
 /**
  * @file CodecFactory.cpp
@@ -7,7 +5,6 @@
  * $Id$
  *
  * @author Johnny Willemsen  <jwillemsen@remedy.nl>
- *
  */
 // =================================================================
 
@@ -21,6 +18,8 @@ ACE_RCSID (CodecFactory,
            CodecFactory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Object_ptr
 TAO_CodecFactory_Loader::create_object (
   CORBA::ORB_ptr orb,
@@ -42,6 +41,8 @@ TAO_CodecFactory_Loader::Initializer (void)
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_CodecFactory_Loader);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_CodecFactory_Loader,
                        ACE_TEXT ("CodecFactory_Loader"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h
index 82c6f95b05d..627045e8844 100644
--- a/TAO/tao/CodecFactory/CodecFactory.h
+++ b/TAO/tao/CodecFactory/CodecFactory.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -30,6 +29,8 @@
 #include "tao/Object_Loader.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_CodecFactory_Export TAO_CodecFactory_Loader
   : public TAO_Object_Loader
 {
@@ -45,12 +46,14 @@ public:
   static int Initializer (void);
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_CodecFactory_Loader)
-ACE_FACTORY_DECLARE (TAO_CodecFactory, TAO_CodecFactory_Loader)
-
 static int
 TAO_Requires_CodecFactory_Initializer = TAO_CodecFactory_Loader::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_CodecFactory_Loader)
+ACE_FACTORY_DECLARE (TAO_CodecFactory, TAO_CodecFactory_Loader)
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_CODECFACTORY_H */
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.cpp b/TAO/tao/CodecFactory/CodecFactory_impl.cpp
index fe2fbcdfea4..e6f8aee023d 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.cpp
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.cpp
@@ -14,6 +14,8 @@ ACE_RCSID (CodecFactory_impl,
            CodecFactory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_CodecFactory::TAO_CodecFactory (TAO_ORB_Core * orb_core)
   : orb_core_ (orb_core)
 {
@@ -146,3 +148,4 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major,
   return codec;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h
index 4259be59c8d..fd9660b2d75 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.h
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.h
@@ -30,6 +30,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Codeset_Translator_Base;
 
 /**
@@ -65,9 +67,8 @@ public:
 private:
   /// Prevent copying through the copy constructor and the assignment
   /// operator.
-  ACE_UNIMPLEMENTED_FUNC (
-    TAO_CodecFactory (const TAO_CodecFactory &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_CodecFactory &))
+  TAO_CodecFactory (const TAO_CodecFactory &);
+  void operator= (const TAO_CodecFactory &);
 
   IOP::Codec_ptr create_codec_i (CORBA::Octet major,
                                  CORBA::Octet minor,
@@ -88,6 +89,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */