diff options
Diffstat (limited to 'ace/Demux/Proactor.cpp')
| -rw-r--r-- | ace/Demux/Proactor.cpp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/ace/Demux/Proactor.cpp b/ace/Demux/Proactor.cpp index 8fe6c8c982c..12b1ad981f0 100644 --- a/ace/Demux/Proactor.cpp +++ b/ace/Demux/Proactor.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "ace/Proactor.h" -#include "ace/Proactor_Impl.h" -#include "ace/Object_Manager.h" -#include "ace/Task_T.h" +#include "ace/Demux/Proactor.h" +#include "ace/Demux/Proactor_Impl.h" +#include "ace/Utils/Object_Manager.h" +#include "ace/Streams/Task_T.h" #if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_SVCCONF) -# include "ace/Service_Config.h" +# include "ace/Svcconf/Service_Config.h" # endif /* !ACE_HAS_WINCE && !ACE_LACKS_ACE_SVCCONF */ ACE_RCSID(ace, Proactor, "$Id$") @@ -13,17 +13,20 @@ ACE_RCSID(ace, Proactor, "$Id$") #if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) // This only works on Win32 platforms and on Unix platforms with aio // calls. -#include "ace/Task_T.h" -#include "ace/Log_Msg.h" +#include "ace/Streams/Task_T.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if defined (ACE_HAS_AIO_CALLS) -# include "ace/POSIX_Proactor.h" +# include "ace/Demux/POSIX_Proactor.h" #else /* !ACE_HAS_AIO_CALLS */ -# include "ace/WIN32_Proactor.h" +# include "ace/Demux/WIN32_Proactor.h" #endif /* ACE_HAS_AIO_CALLS */ #if !defined (__ACE_INLINE__) -#include "ace/Proactor.i" +#include "ace/Demux/Proactor.i" #endif /* __ACE_INLINE__ */ // Process-wide ACE_Proactor. |