Reverted some of the -Weffc++ changes I made.

13 files changed, 11 insertions, 142 deletions

diff --git a/ace/Containers.h b/ace/Containers.h
index 7f9704e4061..73d73c54b8f 100644
--- a/ace/Containers.h
+++ b/ace/Containers.h
@@ -54,13 +54,6 @@ public:
 
 protected:
   ACE_DLList_Node (void);
-
-private:
-  //ACE_DLList_Node (const ACE_DLList_Node &);
-  ACE_DLList_Node & operator= (const ACE_DLList_Node & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/Filecache.h b/ace/Filecache.h
index db2007e8a1a..21feace033d 100644
--- a/ace/Filecache.h
+++ b/ace/Filecache.h
@@ -139,12 +139,6 @@ public:
   };
 
 private:
-  ACE_Filecache_Handle (const ACE_Filecache_Handle &);
-  ACE_Filecache_Handle & operator= (const ACE_Filecache_Handle & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
-
   ACE_Filecache_Object *file_;
   // A reference to the low level instance.
 
diff --git a/ace/IPC_SAP.h b/ace/IPC_SAP.h
index 39f6f59d5bc..e6ee95e1d45 100644
--- a/ace/IPC_SAP.h
+++ b/ace/IPC_SAP.h
@@ -29,7 +29,7 @@ class ACE_Export ACE_IPC_SAP
   //     Defines the member functions for the base class of the
   //     ACE_IPC_SAP abstraction.
 public:
-  virtual ~ACE_IPC_SAP (void);
+  ~ACE_IPC_SAP (void);
   // Default dtor.
 
   int control (int cmd, void *) const;
diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h
index 7bdb5f15b2c..e797f5b7ee9 100644
--- a/ace/Local_Tokens.h
+++ b/ace/Local_Tokens.h
@@ -248,12 +248,6 @@ public:
   // Dump the state of an object.
 
 private:
-  ACE_TPQ_Iterator (const ACE_TPQ_Iterator &);
-  ACE_TPQ_Iterator & operator= (const ACE_TPQ_Iterator & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
-
   ACE_TPQ_Entry *current_;
 };
 
@@ -313,13 +307,6 @@ protected:
   // Tail.
   int size_;
   // Size.
-
-private:
-  ACE_Token_Proxy_Queue (const ACE_Token_Proxy_Queue &);
-  ACE_Token_Proxy_Queue & operator= (const ACE_Token_Proxy_Queue & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
 };
 
 // 5..
@@ -841,13 +828,6 @@ protected:
   virtual ACE_Tokens *create_token (const ASYS_TCHAR *name) = 0;
   // Make the correct type of ACE_Tokens.  This is called by the Token
   // Manager.
-
-private:
-  //ACE_Token_Proxy (const ACE_Token_Proxy &);
-  ACE_Token_Proxy & operator= (const ACE_Token_Proxy & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
 };
 
 // 8..
diff --git a/ace/Malloc.h b/ace/Malloc.h
index 07fb12c6738..57e240da004 100644
--- a/ace/Malloc.h
+++ b/ace/Malloc.h
@@ -115,12 +115,6 @@ public:
 
   void dump (void) const;
   // Dump the state of the object.
-private:
-  ACE_Name_Node (const ACE_Name_Node &);
-  ACE_Name_Node & operator= (const ACE_Name_Node & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
 };
 
 class ACE_Export ACE_Control_Block
@@ -256,14 +250,6 @@ protected:
 
   size_t offset_;
   // Pointer to the current offset in the <buffer_>.
-
-private:
-   ACE_Static_Allocator_Base (const ACE_Static_Allocator_Base &);
-   ACE_Static_Allocator_Base &
-     operator= (const ACE_Static_Allocator_Base & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/Memory_Pool.h b/ace/Memory_Pool.h
index 0d5e36c66da..5be4903deb5 100644
--- a/ace/Memory_Pool.h
+++ b/ace/Memory_Pool.h
@@ -127,14 +127,6 @@ public:
 
   size_t file_perms_;
   // File permissions to use when creating/opening a segment.
-
-private:
-  ACE_Shared_Memory_Pool_Options (const ACE_Shared_Memory_Pool_Options &);
-  ACE_Shared_Memory_Pool_Options &
-      operator= (const ACE_Shared_Memory_Pool_Options & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
 };
 
 class ACE_Export ACE_Shared_Memory_Pool : public ACE_Event_Handler
@@ -246,13 +238,6 @@ protected:
   virtual int handle_signal (int signum, siginfo_t *, ucontext_t *);
   // Handle SIGSEGV and SIGBUS signals to remap shared memory
   // properly.
-
-private:
-  ACE_Shared_Memory_Pool (const ACE_Shared_Memory_Pool &);
-  ACE_Shared_Memory_Pool & operator= (const ACE_Shared_Memory_Pool & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
 };
 #endif /* !ACE_LACKS_SYSV_SHMEM */
 
@@ -370,13 +355,6 @@ public:
   LPSECURITY_ATTRIBUTES sa_;
   // Pointer to a security attributes object.  Only used on NT.
 
-private:
-  ACE_MMAP_Memory_Pool_Options (const ACE_MMAP_Memory_Pool_Options &);
-  ACE_MMAP_Memory_Pool_Options &
-      operator= (const ACE_MMAP_Memory_Pool_Options & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
 };
 
 class ACE_Export ACE_MMAP_Memory_Pool : public ACE_Event_Handler
@@ -491,12 +469,6 @@ protected:
   LPSECURITY_ATTRIBUTES sa_;
   // Security attributes object, only used on NT.
 
-private:
-  ACE_MMAP_Memory_Pool (const ACE_MMAP_Memory_Pool &);
-  ACE_MMAP_Memory_Pool & operator= (const ACE_MMAP_Memory_Pool & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
 };
 
 class ACE_Export ACE_Lite_MMAP_Memory_Pool : public ACE_MMAP_Memory_Pool
diff --git a/ace/OS.h b/ace/OS.h
index 8d3f9e50a18..bd46a77472e 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -1359,14 +1359,7 @@ public:
   // Calls stop and then start.  max_wait_time_ is modified by the
   // call to stop.
 
-private:
-  ACE_Countdown_Time (const ACE_Countdown_Time &);
-  ACE_Countdown_Time & operator= (const ACE_Countdown_Time & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
-
-  ACE_Time_Value *max_wait_time_;
+private:  ACE_Time_Value *max_wait_time_;
   // Maximum time we were willing to wait.
 
   ACE_Time_Value start_time_;
@@ -4381,12 +4374,6 @@ public:
   // routine.
 
 private:
-   ACE_Thread_Adapter (const ACE_Thread_Adapter &);
-   ACE_Thread_Adapter & operator= (const ACE_Thread_Adapter & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
-
   ~ACE_Thread_Adapter (void);
   // Ensure that this object must be allocated on the heap.
 
@@ -4496,12 +4483,6 @@ public:
   // Declare the dynamic allocation hooks.
 
 private:
-   ACE_Thread_Control (const ACE_Thread_Control &);
-   ACE_Thread_Control & operator= (const ACE_Thread_Control & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
-
   ACE_Thread_Manager *tm_;
   // Pointer to the thread manager for this block of code.
 
@@ -4548,12 +4529,6 @@ public:
   // singleton.
 
 private:
-   ACE_Thread_Exit (const ACE_Thread_Exit &);
-   ACE_Thread_Exit & operator= (const ACE_Thread_Exit & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
-
   void *status_;
   // Exit status...
 
diff --git a/ace/SOCK.h b/ace/SOCK.h
index b9a81468c83..ff7fe250221 100644
--- a/ace/SOCK.h
+++ b/ace/SOCK.h
@@ -39,7 +39,7 @@ class ACE_Export ACE_SOCK : public ACE_IPC_SAP
   //    set socket options, get the local and remote addresses, and
   //    close the socket.
 public:
-  virtual ~ACE_SOCK (void);
+  ~ACE_SOCK (void);
   // Default ctor/dtor.
 
   int set_option (int level,
diff --git a/ace/SOCK_IO.h b/ace/SOCK_IO.h
index e9d1ab9ff52..26700cc4064 100644
--- a/ace/SOCK_IO.h
+++ b/ace/SOCK_IO.h
@@ -34,7 +34,7 @@ public:
   ACE_SOCK_IO (void);
   // Constructor.
 
-  virtual ~ACE_SOCK_IO (void);
+  ~ACE_SOCK_IO (void);
   // Destructor.
 
   ssize_t send (const void *buf,
diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h
index e7ec488f33c..c904b07820e 100644
--- a/ace/SV_Semaphore_Simple.h
+++ b/ace/SV_Semaphore_Simple.h
@@ -49,7 +49,7 @@ public:
                            int initial_value = 1,
                            u_short nsems = 1,
                            int perms = ACE_DEFAULT_FILE_PERMS);
-  virtual ~ACE_SV_Semaphore_Simple (void);
+  ~ACE_SV_Semaphore_Simple (void);
 
   int open (const char *name,
             int flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
diff --git a/ace/Service_Object.h b/ace/Service_Object.h
index 28179f828d9..0c73e2c20af 100644
--- a/ace/Service_Object.h
+++ b/ace/Service_Object.h
@@ -105,12 +105,6 @@ public:
   // Declare the dynamic allocation hooks.
 
 private:
-   ACE_Service_Type (const ACE_Service_Type &);
-   ACE_Service_Type & operator= (const ACE_Service_Type & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
-
   const ASYS_TCHAR *name_;
   // Humanly readible name of svc.
 
@@ -158,12 +152,6 @@ public:
   // Smart pointer to access the underlying <ACE_Service_Object>.
 
 private:
-  // ACE_Service_Object_Ptr (const ACE_Service_Object_Ptr &);
-  ACE_Service_Object_Ptr & operator= (const ACE_Service_Object_Ptr & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
-
   ACE_Service_Object *service_object_;
   // Holds the service object until we're done.
 };
diff --git a/ace/Signal.h b/ace/Signal.h
index 1c45e6b6fe6..dc92c572b80 100644
--- a/ace/Signal.h
+++ b/ace/Signal.h
@@ -287,12 +287,6 @@ public:
   // Called by the <Reactor> to dispatch the signal handler.
 
 private:
-   ACE_Sig_Adapter (const ACE_Sig_Adapter &);
-   ACE_Sig_Adapter & operator= (const ACE_Sig_Adapter & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
-
   int sigkey_;
   // Key for this signal handler (used to remove it).
 
diff --git a/ace/Synch.h b/ace/Synch.h
index fa9ccc973d4..21415ad495a 100644
--- a/ace/Synch.h
+++ b/ace/Synch.h
@@ -131,13 +131,6 @@ protected:
   // must overwrite this method for this class to work.
 
   ACE_Lock *lock_;
-
-private:
-  ACE_Adaptive_Lock (const ACE_Adaptive_Lock &);
-  ACE_Adaptive_Lock & operator= (const ACE_Adaptive_Lock & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
 };
 
 class ACE_Export ACE_File_Lock
@@ -251,7 +244,7 @@ public:
                  int max = 0x7fffffff);
   // Initialize the semaphore, with initial value of "count".
 
-  virtual ~ACE_Semaphore (void);
+  ~ACE_Semaphore (void);
   // Implicitly destroy the semaphore.
 
   int remove (void);
@@ -453,7 +446,7 @@ public:
                 void *arg = 0);
   // Initialize a readers/writer lock.
 
-  virtual ~ACE_RW_Mutex (void);
+  ~ACE_RW_Mutex (void);
   // Implicitly destroy a readers/writer lock
 
   int remove (void);
@@ -771,7 +764,7 @@ class ACE_Export ACE_Null_Mutex
   //     no ops.
 public:
   ACE_Null_Mutex (LPCTSTR = 0);
-  virtual ~ACE_Null_Mutex (void);
+  ~ACE_Null_Mutex (void);
   int remove (void);
 
   int acquire (void);
@@ -892,12 +885,6 @@ public:
 
   ACE_THR_DEST func_;
   // The real cleanup routine for ts_obj;
-private:
-  ACE_TSS_Adapter (const ACE_TSS_Adapter &);
-  ACE_TSS_Adapter & operator= (const ACE_TSS_Adapter & rhs);
-  // Explicitly disallow use of implicitly generated copy
-  // constructor and assignment operator to prevent inadvertent
-  // memory leaks.
 };
 
 class ACE_Export ACE_Event
@@ -916,7 +903,7 @@ public:
              void *arg = 0);
   // Constructor which will create event.
 
-  virtual ~ACE_Event (void);
+  ~ACE_Event (void);
   // Implicitly destroy the event variable.
 
   int remove (void);
@@ -1046,7 +1033,7 @@ class ACE_Barrier
   //   This is a no-op to make ACE "syntactically consistent."
 public:
   ACE_Barrier (u_int, LPCTSTR = 0, void * = 0) {}
-  virtual ~ACE_Barrier (void) {}
+  ~ACE_Barrier (void) {}
   int wait (void) { ACE_NOTSUP_RETURN (-1); }
   void dump (void) const {}
 };
@@ -1590,7 +1577,7 @@ public:
   // = Initialization and termination methods.
   ACE_Guard (ACE_Null_Mutex &) {}
   ACE_Guard (ACE_Null_Mutex &, int) {}
-  virtual ~ACE_Guard (void) {}
+  ~ACE_Guard (void) {}
 
   int acquire (void) { return 0; }
   int tryacquire (void) { return 0; }