1 files changed, 10 insertions, 13 deletions
diff --git a/TAO/tao/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h
index cc2c6162c97..6d42d4342ec 100644
--- a/TAO/tao/Cleanup_Func_Registry.h
+++ b/TAO/tao/Cleanup_Func_Registry.h
@@ -15,19 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
 #include "ace/Array_Base.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Cleanup_Func_Registry
  *
@@ -37,15 +32,18 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * invoking the corresponding cleanup function on each object.  Hence,
  * there is a tight coupling between this class and the TAO ORB Core.
  */
-class TAO_Cleanup_Func_Registry
+class TAO_Export TAO_Cleanup_Func_Registry
 {
   friend class TAO_ORB_Core;
 
 public:
 
-  /// Constructor.
+  /// Constructor
   TAO_Cleanup_Func_Registry (void);
 
+  /// Destructor
+  ~TAO_Cleanup_Func_Registry (void);
+
   /// Return the number of registered cleanup functions.
   size_t size (void) const;
 
@@ -67,8 +65,9 @@ private:
 
   /// Prevent copying through the copy constructor and the assignment
   /// operator.
-  TAO_Cleanup_Func_Registry (const TAO_Cleanup_Func_Registry &);
-  void operator= (const TAO_Cleanup_Func_Registry &);
+  ACE_UNIMPLEMENTED_FUNC (
+    TAO_Cleanup_Func_Registry (const TAO_Cleanup_Func_Registry &))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Cleanup_Func_Registry &))
 
 private:
 
@@ -80,10 +79,8 @@ private:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/Cleanup_Func_Registry.inl"
+# include "Cleanup_Func_Registry.inl"
 #endif  /* __ACE_INLINE__ */