diff options
| author | storri <storri@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-18 23:44:14 +0000 |
|---|---|---|
| committer | storri <storri@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-18 23:44:14 +0000 |
| commit | b95975ec9fe5d207c102995fb1750a719866e3b9 (patch) | |
| tree | 11f2b47f3311056ef37b7890d886e76bb9c24bc5 | |
| parent | e1c81fcfd3bfeb2e66fae78a21be122fba57d096 (diff) | |
| download | ATCD-b95975ec9fe5d207c102995fb1750a719866e3b9.tar.gz | |
Sync at end of day
| -rw-r--r-- | ace/Threads/Activation_Queue.h | 6 | ||||
| -rw-r--r-- | ace/Threads/Atomic_Op.cpp | 4 | ||||
| -rw-r--r-- | ace/Threads/Atomic_Op.h | 9 |
3 files changed, 9 insertions, 10 deletions
diff --git a/ace/Threads/Activation_Queue.h b/ace/Threads/Activation_Queue.h index c6fe043c502..dcf3dc2161e 100644 --- a/ace/Threads/Activation_Queue.h +++ b/ace/Threads/Activation_Queue.h @@ -21,8 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Threads/Message_Queue.h" -#include "ace/Method_Request.h" +#include "ace/Streams/Message_Queue.h" +#include "ace/Utils/Method_Request.h" // Be compatible with the terminology in the POSA2 book! #define ACE_Activation_List ACE_Activation_Queue @@ -101,7 +101,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/Activation_Queue.i" +#include "ace/Threads/Activation_Queue.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/Threads/Atomic_Op.cpp b/ace/Threads/Atomic_Op.cpp index df82902efcb..cfc55ab6b8a 100644 --- a/ace/Threads/Atomic_Op.cpp +++ b/ace/Threads/Atomic_Op.cpp @@ -1,7 +1,7 @@ #ifndef ACE_ATOMIC_OP_C #define ACE_ATOMIC_OP_C -#include "ace/Atomic_Op.h" +#include "ace/Threads/Atomic_Op.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -10,7 +10,7 @@ #if !defined (__ACE_INLINE__) // On non-Win32 platforms, this code will be treated as normal code. #if !defined (ACE_WIN32) -#include "ace/Atomic_Op.i" +#include "ace/Threads/Atomic_Op.i" #endif /* !ACE_WIN32 */ #endif /* __ACE_INLINE__ */ diff --git a/ace/Threads/Atomic_Op.h b/ace/Threads/Atomic_Op.h index 42e5f15ba08..bdfa3926208 100644 --- a/ace/Threads/Atomic_Op.h +++ b/ace/Threads/Atomic_Op.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Synch.h" +#include "ace/Threads/Synch.h" /** @@ -154,13 +154,12 @@ private: #if defined (__ACE_INLINE__) // On non-Win32 platforms, this code will be inlined #if !defined (ACE_WIN32) -#include "ace/Atomic_Op.i" +#include "ace/Threads/Atomic_Op.i" #endif /* !ACE_WIN32 */ #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) - -#include "Atomic_Op.cpp" +#include "ace/Threads/Atomic_Op.cpp" // On Win32 platforms, this code will be included as template source // code and will not be inlined. Therefore, we first turn off // ACE_INLINE, set it to be nothing, include the code, and then turn @@ -172,7 +171,7 @@ private: #if defined (ACE_WIN32) #undef ACE_INLINE #define ACE_INLINE -#include "ace/Atomic_Op.i" +#include "ace/Threads/Atomic_Op.i" #undef ACE_INLINE #if defined (__ACE_INLINE__) #define ACE_INLINE inline |