(Peer_Connector::open): added (unused) arguments to open () method.

2 files changed, 13 insertions, 10 deletions

diff --git a/apps/Gateway/Peer/Peer.cpp b/apps/Gateway/Peer/Peer.cpp
index 21abf58a8f7..429a4c24522 100644
--- a/apps/Gateway/Peer/Peer.cpp
+++ b/apps/Gateway/Peer/Peer.cpp
@@ -484,8 +484,8 @@ Peer_Handler::await_connection_id (void)
 
   // Register this handler to receive test events on stdin.
   if (ACE_Event_Handler::register_stdin_handler (this,
-						 ACE_Reactor::instance (),
-						 ACE_Thread_Manager::instance ()) == -1)
+                                                 ACE_Reactor::instance (),
+                                                 ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_stdin_handler"), -1);
 
   return 0;
@@ -694,7 +694,7 @@ Peer_Connector::open_connector (Peer_Handler *&peer_handler,
 }
 
 int
-Peer_Connector::open (void)
+Peer_Connector::open (ACE_Reactor *, int)
 {
   this->supplier_peer_handler_ = 0;
   this->consumer_peer_handler_ = 0;
diff --git a/apps/Gateway/Peer/Peer.h b/apps/Gateway/Peer/Peer.h
index 67b9a936dd7..e0f8ebf47eb 100644
--- a/apps/Gateway/Peer/Peer.h
+++ b/apps/Gateway/Peer/Peer.h
@@ -20,7 +20,7 @@
 //    2. When a gatewayd connects, <Peer_Acceptor> creates an
 //       <Peer_Handler> object that sends/receives events from
 //       gatewayd on that connection.
-//  
+//
 //    3. The <Peer_Handler> waits for gatewayd to inform it of its
 //       connection ID, which is prepended to all subsequent outgoing
 //       events sent from peerd.
@@ -84,11 +84,11 @@ public:
   // Finish sending a event when flow control conditions abate.
 
   virtual int handle_timeout (const ACE_Time_Value &,
-			      const void *arg);
+                              const void *arg);
   // Periodically send events via <ACE_Reactor> timer mechanism.
 
   virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-			    ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
+                            ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
   // Perform object termination.
 
 protected:
@@ -150,7 +150,7 @@ public:
 
   int open (u_short);
   //  the <Peer_Acceptor>.
-  
+
   int close (void);
   // Terminate the <Peer_Acceptor>.
 
@@ -178,8 +178,11 @@ class ACE_Svc_Export Peer_Connector : public ACE_Connector<Peer_Handler, ACE_SOC
   //     gatewayd.
 public:
   // = Initialization method.
-  int open (void);
-  // Initialize the <Peer_Connector>.
+  int open (ACE_Reactor * = 0, int = 0);
+  // Initialize the <Peer_Connector>.  NOTE:  the arguments are
+  // ignored.  They are only provided to avoid a compiler warning
+  // about hiding the virtual function ACE_Connector<Peer_Handler,
+  // ACE_SOCK_CONNECTOR>::open(ACE_Reactor*, int)
 
 private:
   int open_connector (Peer_Handler *&ph, u_short port);
@@ -198,7 +201,7 @@ class ACE_Svc_Export Peer_Factory : public ACE_Service_Object
   //     A factory class that actively and/or passively establishes
   //     connections with the gatewayd.
 public:
-  // = Dynamic initialization and termination hooks from <ACE_Service_Object>. 
+  // = Dynamic initialization and termination hooks from <ACE_Service_Object>.
 
   virtual int init (int argc, char *argv[]);
   // Initialize the acceptor and connector.