1 files changed, 5 insertions, 31 deletions

diff --git a/ACE/ace/Reactor.cpp b/ACE/ace/Reactor.cpp
index b23e3effe2a..e08c9b9d141 100644
--- a/ACE/ace/Reactor.cpp
+++ b/ACE/ace/Reactor.cpp
@@ -4,14 +4,6 @@
 #  include "ace/Service_Config.h"
 #endif /* !ACE_LACKS_ACE_SVCCONF */
 
-/*
- * Hook to specialize the includes directly with the concrete
- * Reactor type, e.g., select, thread pool reactor
- * known at compile time. This hook results in all the
- * #defines being commented
- * out and the concrete header file directly included.
- */
-//@@ REACTOR_SPL_COMMENT_INCLUDE_START_HOOK
 // Only include the headers needed to compile.
 #if !defined (ACE_WIN32) \
       || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) \
@@ -35,11 +27,6 @@
 #  endif /* ACE_USE_MSG_WFMO_REACTOR_FOR_REACTOR_IMPL */
 #endif /* !defined (ACE_WIN32) || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) */
 
-/*
- * End comment hook.
- */
-//@@ REACTOR_SPL_COMMENT_INCLUDE_END_HOOK
-
 #include "ace/Static_Object_Lock.h"
 #include "ace/Framework_Component.h"
 #include "ace/Guard_T.h"
@@ -62,13 +49,6 @@ ACE_Reactor::ACE_Reactor (ACE_Reactor_Impl *impl,
 
   if (this->implementation () == 0)
     {
-/*
- * Hook to specialize the reactor implementation with the concrete
- * Reactor implementation known at compile time. This hook will
- * cause the conditionally defined code to be commented out and
- * the concrete Reactor directly created.
- */
-//@@ REACTOR_SPL_CONSTRUCTOR_COMMENT_HOOK_START
 #if !defined (ACE_WIN32) \
       || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) \
       || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) \
@@ -95,18 +75,12 @@ ACE_Reactor::ACE_Reactor (ACE_Reactor_Impl *impl,
                ACE_WFMO_Reactor);
   #endif /* ACE_USE_MSG_WFMO_REACTOR_FOR_REACTOR_IMPL */
 #endif /* !defined (ACE_WIN32) || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) */
-
-/*
- * End hook.
- */
-//@@ REACTOR_SPL_CONSTRUCTOR_COMMENT_HOOK_END
-
       this->implementation (impl);
       this->delete_implementation_ = true;
     }
 }
 
-ACE_Reactor::~ACE_Reactor (void)
+ACE_Reactor::~ACE_Reactor ()
 {
   this->implementation ()->close ();
   if (this->delete_implementation_)
@@ -121,7 +95,7 @@ ACE_Reactor *ACE_Reactor::reactor_ = 0;
 bool ACE_Reactor::delete_reactor_ = false;
 
 ACE_Reactor *
-ACE_Reactor::instance (void)
+ACE_Reactor::instance ()
 {
   ACE_TRACE ("ACE_Reactor::instance");
 
@@ -165,7 +139,7 @@ ACE_Reactor::instance (ACE_Reactor *r, bool delete_reactor)
 }
 
 void
-ACE_Reactor::close_singleton (void)
+ACE_Reactor::close_singleton ()
 {
   ACE_TRACE ("ACE_Reactor::close_singleton");
 
@@ -181,13 +155,13 @@ ACE_Reactor::close_singleton (void)
 }
 
 const ACE_TCHAR *
-ACE_Reactor::dll_name (void)
+ACE_Reactor::dll_name ()
 {
   return ACE_TEXT ("ACE");
 }
 
 const ACE_TCHAR *
-ACE_Reactor::name (void)
+ACE_Reactor::name ()
 {
   return ACE_TEXT ("ACE_Reactor");
 }