diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2010-01-13 14:41:36 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2010-01-13 14:41:36 +0000 |
| commit | fd892cdfcdbc5094db67c8da8bdf93823dfd50cf (patch) | |
| tree | 17cc4ff98d2974ddc5594c66576de3310b3db249 | |
| parent | 6c272b66bd6039d555cda97d5358c617729a7a8e (diff) | |
| download | ATCD-fd892cdfcdbc5094db67c8da8bdf93823dfd50cf.tar.gz | |
ChangeLogTag:Wed
| -rw-r--r-- | ACE/ChangeLog | 10 | ||||
| -rw-r--r-- | ACE/ace/Message_Queue.h | 4 | ||||
| -rw-r--r-- | ACE/ace/Message_Queue_T.cpp | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 60459a55a7d..49084ce216a 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,13 @@ +Wed Jan 13 14:40:35 UTC 2010 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Message_Queue.h: Moved + + #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) + #include "ace/Message_Queue_NT.h" + #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ + + back to this file based on comments from Arto. + Wed Jan 13 13:51:54 UTC 2010 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> * ace/Message_Queue_T.cpp: Moved diff --git a/ACE/ace/Message_Queue.h b/ACE/ace/Message_Queue.h index 52be1b0f02b..b3a4d5c8365 100644 --- a/ACE/ace/Message_Queue.h +++ b/ACE/ace/Message_Queue.h @@ -222,6 +222,10 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL +#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#include "ace/Message_Queue_NT.h" +#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ + // Include the templates here. #include "ace/Message_Queue_T.h" diff --git a/ACE/ace/Message_Queue_T.cpp b/ACE/ace/Message_Queue_T.cpp index 163414a963f..cb01fbbc3d5 100644 --- a/ACE/ace/Message_Queue_T.cpp +++ b/ACE/ace/Message_Queue_T.cpp @@ -22,10 +22,6 @@ #include "ace/Monitor_Size.h" #endif /* ACE_HAS_MONITOR_POINTS==1 */ -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) -#include "ace/Message_Queue_NT.h" -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Message_Queue) |