Mon Aug 20 14:16:20 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

3 files changed, 6 insertions, 10 deletions

diff --git a/ACE/netsvcs/lib/Log_Message_Receiver.h b/ACE/netsvcs/lib/Log_Message_Receiver.h
index 38718a2ec43..a067ca537c7 100644
--- a/ACE/netsvcs/lib/Log_Message_Receiver.h
+++ b/ACE/netsvcs/lib/Log_Message_Receiver.h
@@ -177,7 +177,6 @@ private:
 template<ACE_SYNCH_DECL>
 class Log_Message_Receiver_Impl
 {
-  friend class ACE_Shutup_GPlusPlus;  // Turn off g++ warning
 public:
   // Methods for handling reference count and instance lifetime
   static Log_Message_Receiver_Impl *create (void);
@@ -191,7 +190,7 @@ public:
                   ACE_Log_Record &record,
                   ostream *output);
 
-private:
+protected:
   Log_Message_Receiver_Impl (void);
   ~Log_Message_Receiver_Impl (void);
 
@@ -200,6 +199,7 @@ private:
   int count_;
   ACE_SYNCH_MUTEX_T print_lock_;
 
+private:
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
   static ACE_SYNCH_MUTEX_T copy_lock_;
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
diff --git a/ACE/netsvcs/lib/Name_Handler.h b/ACE/netsvcs/lib/Name_Handler.h
index 496e3a4cca1..40c7e893499 100644
--- a/ACE/netsvcs/lib/Name_Handler.h
+++ b/ACE/netsvcs/lib/Name_Handler.h
@@ -66,8 +66,6 @@ template class ACE_Svc_Export ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
  */
 class ACE_Svc_Export ACE_Name_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 {
-
-  friend class ACE_Shutup_GPlusPlus;  // Turn off g++ warning
 public:
   /// Pointer to a member function of ACE_Name_Handler returning int
   typedef int (ACE_Name_Handler::*OPERATION) (void);
@@ -123,6 +121,9 @@ protected:
   /// Enable clients to limit the amount of time they wait for a name.
   virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg);
 
+  /// Ensure dynamic allocation...
+  ~ACE_Name_Handler (void);
+
 private:
 
   /// Table of pointers to member functions
@@ -158,9 +159,6 @@ private:
   /// Address of client we are connected with.
   ACE_INET_Addr addr_;
 
-  /// Ensure dynamic allocation...
-  ~ACE_Name_Handler (void);
-
   /// Handle binds.
   int bind (void);
 
diff --git a/ACE/netsvcs/lib/TS_Server_Handler.h b/ACE/netsvcs/lib/TS_Server_Handler.h
index 1fca9bce0fe..8d1d4f39484 100644
--- a/ACE/netsvcs/lib/TS_Server_Handler.h
+++ b/ACE/netsvcs/lib/TS_Server_Handler.h
@@ -38,8 +38,6 @@ template class ACE_Svc_Export ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
  */
 class ACE_Svc_Export ACE_TS_Server_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 {
-
-  friend class ACE_Shutup_GPlusPlus;  // Turn off g++ warning
 public:
   // = Initialization and termination.
 
@@ -50,10 +48,10 @@ public:
   /// <ACE_Strategy_Acceptor>).
   virtual int open (void * = 0);
 
+protected:
   /// Must be allocated dynamically.
   ~ACE_TS_Server_Handler (void);
 
-protected:
   // = Helper routines for the operations exported to clients.
 
   /// Give up waiting (e.g., when a timeout occurs or a client shuts