Moved a few methods from ACE to ACE_Event_Handler

1 files changed, 0 insertions, 68 deletions

diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 07dadc9d28b..42d6ee6f0f8 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -4,8 +4,6 @@
 #include "ace/IPC_SAP.h"
 #include "ace/Handle_Set.h"
 #include "ace/ACE.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Reactor.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/INET_Addr.h"
 #include "ace/SString.h"
@@ -129,72 +127,6 @@ ACE::process_active (pid_t pid)
 #endif /* ACE_WIN32 */
 }
 
-#if !defined (ACE_HAS_WINCE)
-int
-ACE::register_stdin_handler (ACE_Event_Handler *eh,
-                             ACE_Reactor *reactor,
-                             ACE_Thread_Manager *thr_mgr,
-                             int flags)
-{
-#if defined (ACE_WIN32)
-  ACE_UNUSED_ARG (reactor);
-
-  eh->reactor (reactor);
-  return thr_mgr->spawn (&ACE::read_adapter, (void *) eh, flags);
-#else
-  // Keep compilers happy.
-  ACE_UNUSED_ARG (flags);
-  ACE_UNUSED_ARG (thr_mgr);
-  return reactor->register_handler (ACE_STDIN,
-                                    eh,
-                                    ACE_Event_Handler::READ_MASK);
-#endif /* ACE_WIN32 */
-}
-
-int
-ACE::remove_stdin_handler (ACE_Reactor *reactor,
-                           ACE_Thread_Manager *thr_mgr)
-{
-#if defined (ACE_WIN32)
-  ACE_UNUSED_ARG (reactor);
-  ACE_UNUSED_ARG (thr_mgr);
-
-  // What should we do here?
-  ACE_NOTSUP_RETURN (-1);
-#else
-  // Keep compilers happy.
-  ACE_UNUSED_ARG (thr_mgr);
-  return reactor->remove_handler (ACE_STDIN,
-                                  ACE_Event_Handler::READ_MASK);
-#endif /* ACE_WIN32 */
-}
-
-// Used to read from non-socket ACE_HANDLEs in our own thread to work
-// around Win32 limitations that don't allow us to select() on
-// non-sockets (such as ACE_STDIN).  This is commonly used in
-// situations where the Reactor is used to demultiplex read events on
-// ACE_STDIN on UNIX.  Note that <event_handler> must be a subclass of
-// <ACE_Event_Handler>.  If the <get_handle> method of this event
-// handler returns <ACE_INVALID_HANDLE> we default to reading from
-// ACE_STDIN.
-
-void *
-ACE::read_adapter (void *args)
-{
-  ACE_Event_Handler *this_ptr = (ACE_Event_Handler *) args;
-  ACE_HANDLE handle = ACE_STDIN;
-
-  while (this_ptr->handle_input (handle) != -1)
-    continue;
-
-  this_ptr->handle_close (handle,
-                          ACE_Event_Handler::READ_MASK);
-  this_ptr->reactor ()->notify ();
-
-  return 0;
-}
-#endif /* ACE_HAS_WINCE */
-
 // Split a string up into 'token'-delimited pieces, ala Perl's
 // "split".