Removed not used reactor_ member, cleanup, and const changes

    * ACE/ace/Name_Proxy.cpp:
    * ACE/ace/Name_Proxy.h:

2 files changed, 15 insertions, 33 deletions

diff --git a/ACE/ace/Name_Proxy.cpp b/ACE/ace/Name_Proxy.cpp
index 13110923bd7..b4d5f702b95 100644
--- a/ACE/ace/Name_Proxy.cpp
+++ b/ACE/ace/Name_Proxy.cpp
@@ -2,8 +2,6 @@
 #include "ace/Log_Category.h"
 #include "ace/os_include/arpa/os_inet.h"
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
@@ -15,43 +13,35 @@ ACE_Name_Proxy::dump () const
   ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->connector_.dump ();
   this->peer_.dump ();
-  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("reactor_ = %x"), this->reactor_));
   ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
-// Default constructor.
-
+/// Default constructor.
 ACE_Name_Proxy::ACE_Name_Proxy ()
-  : reactor_ (0)
 {
   ACE_TRACE ("ACE_Name_Proxy::ACE_Name_Proxy");
 }
 
-// Establish binding with the ACE_Name Server at remote_addr.
-
+/// Establish binding with the ACE_Name Server at remote_addr.
 int
 ACE_Name_Proxy::open (const ACE_INET_Addr &remote_addr,
                       ACE_Synch_Options& options)
 {
   ACE_TRACE ("ACE_Name_Proxy::open");
-  ACE_Time_Value *timeout = 0;
+  ACE_Time_Value *timeout {};
 
   if (options[ACE_Synch_Options::USE_TIMEOUT])
     timeout = const_cast<ACE_Time_Value *> (options.time_value ());
 
   // Initiate the connection.
-  return this->connector_.connect (this->peer_,
-                                   remote_addr,
-                                   timeout);
+  return this->connector_.connect (this->peer_, remote_addr, timeout);
 }
 
-// Establish binding with the ACE_Name Server at remote_addr.
-
+/// Establish binding with the ACE_Name Server at remote_addr.
 ACE_Name_Proxy::ACE_Name_Proxy (
   const ACE_INET_Addr &remote_addr,
   ACE_Synch_Options& options)
-   : reactor_ (0)
 {
   ACE_TRACE ("ACE_Name_Proxy::ACE_Name_Proxy");
   if (this->open (remote_addr, options) == -1
@@ -61,9 +51,8 @@ ACE_Name_Proxy::ACE_Name_Proxy (
                 ACE_TEXT ("ACE_Name_Proxy::ACE_Name_Proxy")));
 }
 
-// Obtain underlying handle.
-
-/* VIRTUAL */ ACE_HANDLE
+/// Obtain underlying handle.
+ACE_HANDLE
 ACE_Name_Proxy::get_handle () const
 {
   ACE_TRACE ("ACE_Name_Proxy::get_handle");
@@ -74,8 +63,8 @@ int
 ACE_Name_Proxy::request_reply (ACE_Name_Request &request)
 {
   ACE_TRACE ("ACE_Name_Proxy::request_reply");
-  void *buffer;
-  ssize_t length = request.encode (buffer);
+  void *buffer {};
+  ssize_t const length = request.encode (buffer);
 
   if (length == -1)
     ACELIB_ERROR_RETURN ((LM_ERROR,
@@ -84,7 +73,6 @@ ACE_Name_Proxy::request_reply (ACE_Name_Request &request)
                       -1);
 
   // Transmit request via a blocking send.
-
   if (this->peer_.send_n (buffer, length) != length)
     ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
@@ -95,7 +83,6 @@ ACE_Name_Proxy::request_reply (ACE_Name_Request &request)
       ACE_Name_Reply reply;
 
       // Receive reply via blocking read.
-
       if (this->peer_.recv_n (&reply,
                               sizeof reply) == -1)
         ACELIB_ERROR_RETURN ((LM_ERROR,
@@ -116,8 +103,8 @@ int
 ACE_Name_Proxy::send_request (ACE_Name_Request &request)
 {
   ACE_TRACE ("ACE_Name_Proxy::send_request");
-  void *buffer;
-  ssize_t length = request.encode (buffer);
+  void *buffer {};
+  ssize_t const length = request.encode (buffer);
 
   if (length == -1)
     ACELIB_ERROR_RETURN ((LM_ERROR,
@@ -126,7 +113,6 @@ ACE_Name_Proxy::send_request (ACE_Name_Request &request)
                       -1);
 
   // Transmit request via a blocking send.
-
   else if (this->peer_.send_n (buffer, length) != length)
     ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
@@ -166,7 +152,7 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply)
     }
 
   // Transform the length into host byte order.
-  ssize_t length = ACE_NTOHL (reply.length ());
+  ssize_t const length = ACE_NTOHL (reply.length ());
 
   // Receive the rest of the request message.
   // @@ beware of blocking read!!!.
@@ -195,8 +181,7 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply)
   return 0;
 }
 
-// Close down the connection to the server.
-
+/// Close down the connection to the server.
 ACE_Name_Proxy::~ACE_Name_Proxy ()
 {
   ACE_TRACE ("ACE_Name_Proxy::~ACE_Name_Proxy");
diff --git a/ACE/ace/Name_Proxy.h b/ACE/ace/Name_Proxy.h
index 93ac6d6c608..88483796343 100644
--- a/ACE/ace/Name_Proxy.h
+++ b/ACE/ace/Name_Proxy.h
@@ -46,7 +46,7 @@ class ACE_Export ACE_Name_Proxy : public ACE_Event_Handler
 {
 public:
   /// Default constructor.
-  ACE_Name_Proxy (void);
+  ACE_Name_Proxy ();
 
   // = Establish a binding with the ACE_Name Server.
   ACE_Name_Proxy (const ACE_INET_Addr &remote_addr, // Address of ACE_Name Server.
@@ -70,7 +70,7 @@ public:
   virtual ACE_HANDLE get_handle () const;
 
   /// Close down the connection to the server.
-  virtual ~ACE_Name_Proxy (void);
+  virtual ~ACE_Name_Proxy ();
 
   /// Dump the state of the object;
   void dump () const;
@@ -82,9 +82,6 @@ private:
   /// Connection to ACE_Name Server peer.
   ACE_SOCK_Stream peer_;
 
-  /// Pointer to ACE_Reactor (used if we are run in "reactive-mode").
-  ACE_Reactor *reactor_;
-
 private:
   ACE_Name_Proxy (const ACE_Name_Proxy &) = delete;
   ACE_Name_Proxy &operator= (const ACE_Name_Proxy &) = delete;