1 files changed, 7 insertions, 21 deletions
diff --git a/ace/Framework_Component.h b/ace/Framework_Component.h
index d0d2e6f89e2..318867773ba 100644
--- a/ace/Framework_Component.h
+++ b/ace/Framework_Component.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    Framework_Component.h
@@ -9,7 +8,7 @@
  * A prototype mechanism that allows framework components, singletons
  * such as ACE_Reactor, ACE_Proactor, etc, to be registered with a
  * central repository managed by the <ACE_Object_Manager> or
- * ACE_Service_Config that will handle destruction.
+ * <ACE_Service_Config> that will handle destruction.
  *
  * This technique obviates changing ACE_Object_Manager and
  * ACE_Service_Config everytime a new framework is added.  Which also
@@ -48,8 +47,6 @@
 
 #define ACE_DEFAULT_FRAMEWORK_REPOSITORY_SIZE 1024
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class ACE_Framework_Component
  *
@@ -74,11 +71,6 @@ protected:
   virtual ~ACE_Framework_Component (void);
 
 private:
-  // No copy possible
-  ACE_Framework_Component (const ACE_Framework_Component &);
-  void operator= (const ACE_Framework_Component &);
-
-private:
   /// Pointer to the actual component.
   const void *this_;
 
@@ -152,13 +144,12 @@ public:
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
-protected:
+private:
+  // = Initialization and termination methods.
 
   /// Initialize the repository.
   ACE_Framework_Repository (int size = ACE_Framework_Repository::DEFAULT_SIZE);
 
-private:
-
   /// Actually removes the dll components, must be called with locks held.
   int remove_dll_components_i (const ACE_TCHAR *dll_name);
 
@@ -166,12 +157,6 @@ private:
   /// order.
   void compact (void);
 
-  /// Disallow copying and assignment.
-  ACE_Framework_Repository (const ACE_Framework_Repository &);
-  ACE_Framework_Repository &operator= (const ACE_Framework_Repository &);
-
-private:
-
   /// Contains all the framework components.
   ACE_Framework_Component **component_vector_;
 
@@ -195,10 +180,11 @@ private:
   ACE_Thread_Mutex lock_;
 #endif /* ACE_MT_SAFE */
 
+  /// Don't allow these to be called.
+  ACE_UNIMPLEMENTED_FUNC (ACE_Framework_Repository (const ACE_Framework_Repository &))
+  ACE_UNIMPLEMENTED_FUNC (ACE_Framework_Repository &operator= (const ACE_Framework_Repository &))
 };
 
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
 #include "ace/Framework_Component.inl"
 #endif /* __ACE_INLINE__ */