1 files changed, 26 insertions, 41 deletions

diff --git a/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp b/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp
index 608745d721f..314c004cdb4 100644
--- a/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp
+++ b/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp
@@ -9,23 +9,14 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/Signal.h"
 
-
-
-#define PR_ST_1 ACE_PEER_STREAM_1
-#define PR_ST_2 ACE_PEER_STREAM_2
-#define PR_AC_1 ACE_PEER_ACCEPTOR_1
-#define PR_AC_2 ACE_PEER_ACCEPTOR_2
-#define PR_AD ACE_PEER_STREAM_ADDR
-#define SVH SVC_HANDLER
-
-template <PR_ST_1>
-Svc_Handler<PR_ST_2>::Svc_Handler (ACE_Reactor *r)
+template <typename PEER_STREAM>
+Svc_Handler<PEER_STREAM>::Svc_Handler (ACE_Reactor *r)
   : SVC_HANDLER (0, 0, r)
 {
 }
 
-template <PR_ST_1> int
-Svc_Handler<PR_ST_2>::close (u_long)
+template <typename PEER_STREAM> int
+Svc_Handler<PEER_STREAM>::close (u_long)
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("calling Svc_Handler close\n")));
 
@@ -34,10 +25,10 @@ Svc_Handler<PR_ST_2>::close (u_long)
   return 0;
 }
 
-template <PR_ST_1> int
-Svc_Handler<PR_ST_2>::open (void *)
+template <typename PEER_STREAM> int
+Svc_Handler<PEER_STREAM>::open (void *)
 {
-  PR_AD client_addr;
+  typename PEER_STREAM::PEER_ADDR client_addr;
   ACE_TCHAR buf[BUFSIZ];
 
   if (this->peer ().get_remote_addr (client_addr) == -1)
@@ -64,8 +55,8 @@ Svc_Handler<PR_ST_2>::open (void *)
 
 // Receive and process the data from the client.
 
-template <PR_ST_1> int
-Svc_Handler<PR_ST_2>::handle_input (ACE_HANDLE)
+template <typename PEER_STREAM> int
+Svc_Handler<PEER_STREAM>::handle_input (ACE_HANDLE)
 {
   char buf[BUFSIZ];
 
@@ -94,16 +85,16 @@ Svc_Handler<PR_ST_2>::handle_input (ACE_HANDLE)
   return 0;
 }
 
-template <PR_ST_1> int
-Svc_Handler<PR_ST_2>::handle_timeout (const ACE_Time_Value &,
+template <typename PEER_STREAM> int
+Svc_Handler<PEER_STREAM>::handle_timeout (const ACE_Time_Value &,
                                       const void *)
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%p\n"), ACE_TEXT ("handle_timeout")));
   return 0;
 }
 
-template <class SVH, PR_AC_1> int
-IPC_Server<SVH, PR_AC_2>::init (int argc, ACE_TCHAR *argv[])
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::init (int argc, ACE_TCHAR *argv[])
 {
   const ACE_TCHAR *local_addr = argc > 1
     ? argv[1]
@@ -155,25 +146,25 @@ IPC_Server<SVH, PR_AC_2>::init (int argc, ACE_TCHAR *argv[])
     return 0;
 }
 
-template <class SVH, PR_AC_1>
-IPC_Server<SVH, PR_AC_2>::IPC_Server (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
+IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::IPC_Server (void)
   : done_handler_ (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop))
 {
 }
 
-template <class SVH, PR_AC_1> int
-IPC_Server<SVH, PR_AC_2>::fini (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::fini (void)
 {
   return 0;
 }
 
-template <class SVH, PR_AC_1>
-IPC_Server<SVH, PR_AC_2>::~IPC_Server (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
+IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::~IPC_Server (void)
 {
 }
 
-template <class SVH, PR_AC_1> int
-IPC_Server<SVH, PR_AC_2>::handle_close (ACE_HANDLE handle,
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::handle_close (ACE_HANDLE handle,
                                        ACE_Reactor_Mask mask)
 {
   ACE_UNUSED_ARG (handle);
@@ -186,8 +177,8 @@ IPC_Server<SVH, PR_AC_2>::handle_close (ACE_HANDLE handle,
 
 // Run the interative service.
 
-template <class SVH, PR_AC_1> int
-IPC_Server<SVH, PR_AC_2>::svc (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::svc (void)
 {
   ACE_TCHAR buf[BUFSIZ];
 
@@ -207,9 +198,9 @@ IPC_Server<SVH, PR_AC_2>::svc (void)
 
   while (ACE_Reactor::event_loop_done () == 0)
     {
-      SVH sh (this->reactor ());
+      SVC_HANDLER sh (this->reactor ());
 
-      // Create a new <SVH> endpoint, which performs all processing in
+      // Create a new <SVC_HANDLER> endpoint, which performs all processing in
       // its <open> method (note no automatic restart if errno ==
       // EINTR).
 
@@ -230,7 +221,7 @@ IPC_Server<SVH, PR_AC_2>::svc (void)
                         this->acceptor ().get_handle ()));
         }
 
-      // <SVH>'s destructor closes the stream implicitly but the
+      // <SVC_HANDLER>'s destructor closes the stream implicitly but the
       // listening endpoint stays open.
     }
 
@@ -238,10 +229,4 @@ IPC_Server<SVH, PR_AC_2>::svc (void)
   return 0;
 }
 
-#undef PR_ST_1
-#undef PR_ST_2
-#undef PR_AC_1
-#undef PR_AC_2
-#undef PR_AD
-#undef SVH
 #endif /* CPP_ACCEPTOR_C */