diff options
57 files changed, 278 insertions, 168 deletions
diff --git a/ace/Demux/Select_Reactor_Base.h b/ace/Demux/Select_Reactor_Base.h index bd94ead7807..f63a63c6cc2 100644 --- a/ace/Demux/Select_Reactor_Base.h +++ b/ace/Demux/Select_Reactor_Base.h @@ -37,7 +37,7 @@ typedef int (ACE_Event_Handler::*ACE_EH_PTMF) (ACE_HANDLE); // Forward declaration. class ACE_Select_Reactor_Impl; -/ + /** * @class ACE_Select_Reactor_Handle_Set * diff --git a/ace/Demux/Select_Reactor_Base.i b/ace/Demux/Select_Reactor_Base.i index f04446e2e86..2e774b5152c 100644 --- a/ace/Demux/Select_Reactor_Base.i +++ b/ace/Demux/Select_Reactor_Base.i @@ -1,7 +1,7 @@ /* -*- C++ -*- */ // $Id$ -#include "ace/Reactor.h" +#include "ace/Demux/Reactor.h" ACE_INLINE ACE_Event_Tuple::~ACE_Event_Tuple (void) diff --git a/ace/Demux/Select_Reactor_T.cpp b/ace/Demux/Select_Reactor_T.cpp index 030397747b4..b3f9b4b2e86 100644 --- a/ace/Demux/Select_Reactor_T.cpp +++ b/ace/Demux/Select_Reactor_T.cpp @@ -3,21 +3,24 @@ #ifndef ACE_SELECT_REACTOR_T_C #define ACE_SELECT_REACTOR_T_C -#include "ace/Select_Reactor_T.h" +#include "ace/Demux/Select_Reactor_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#ifdef ACE_SUBSET_0 #include "ace/Log_Msg.h" -#include "ace/Thread.h" -#include "ace/Timer_Heap.h" +#endif + +#include "ace/Threads/Thread.h" +#include "ace/Timer/Timer_Heap.h" // @@ The latest version of SunCC can't grok the code if we put inline // function here. Therefore, we temporarily disable the code here. // We shall turn this back on once we know the problem gets fixed. #if 1 // !defined (__ACE_INLINE__) -#include "ace/Select_Reactor_T.i" +#include "ace/Demux/Select_Reactor_T.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Select_Reactor_T, "$Id$") diff --git a/ace/IPC/Pipe.h b/ace/IPC/Pipe.h index d58767b1729..3595e385e9c 100644 --- a/ace/IPC/Pipe.h +++ b/ace/IPC/Pipe.h @@ -79,7 +79,7 @@ private: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/Pipe.i" +#include "ace/IPC/Pipe.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ #include "ace/post.h" diff --git a/ace/IPC/SV_Semaphore_Complex.h b/ace/IPC/SV_Semaphore_Complex.h index d89c855cc69..4ad8f9aeb90 100644 --- a/ace/IPC/SV_Semaphore_Complex.h +++ b/ace/IPC/SV_Semaphore_Complex.h @@ -14,7 +14,7 @@ #define ACE_SV_SEMAPHORE_COMPLEX_H #include "ace/pre.h" -#include "ace/SV_Semaphore_Simple.h" +#include "ace/IPC/SV_Semaphore_Simple.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -148,7 +148,7 @@ private: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SV_Semaphore_Complex.i" +#include "ace/IPC/SV_Semaphore_Complex.i" #endif #include "ace/post.h" diff --git a/ace/IPC/SV_Semaphore_Complex.i b/ace/IPC/SV_Semaphore_Complex.i index 82ce23bbbef..48228c4bfca 100644 --- a/ace/IPC/SV_Semaphore_Complex.i +++ b/ace/IPC/SV_Semaphore_Complex.i @@ -3,81 +3,106 @@ // SV_Semaphore_Complex.i -#include "ace/Trace.h" +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Trace.h" +#endif ASYS_INLINE int ACE_SV_Semaphore_Complex::acquire (u_short n, int flags) const { + +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Complex::acquire"); +#endif return ACE_SV_Semaphore_Simple::acquire ((u_short) n + 2, flags); } ASYS_INLINE int ACE_SV_Semaphore_Complex::acquire_read (u_short n, int flags) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Complex::acquire_read"); +#endif return this->acquire (n, flags); } ASYS_INLINE int ACE_SV_Semaphore_Complex::acquire_write (u_short n, int flags) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Complex::acquire_write"); +#endif return this->acquire (n, flags); } ASYS_INLINE int ACE_SV_Semaphore_Complex::tryacquire (u_short n, int flags) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Complex::tryacquire"); +#endif return ACE_SV_Semaphore_Simple::tryacquire ((u_short) n + 2, flags); } ASYS_INLINE int ACE_SV_Semaphore_Complex::tryacquire_read (u_short n, int flags) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Complex::tryacquire_read"); +#endif return this->tryacquire (n, flags); } ASYS_INLINE int ACE_SV_Semaphore_Complex::tryacquire_write (u_short n, int flags) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Complex::tryacquire_write"); +#endif return this->tryacquire (n, flags); } ASYS_INLINE int ACE_SV_Semaphore_Complex::release (u_short n, int flags) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Complex::release"); +#endif return ACE_SV_Semaphore_Simple::release ((u_short) n + 2, flags); } ASYS_INLINE int ACE_SV_Semaphore_Complex::op (int val, u_short n, int flags) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Complex::op"); +#endif return ACE_SV_Semaphore_Simple::op (val, (u_short) n + 2, flags); } ASYS_INLINE int ACE_SV_Semaphore_Complex::op (sembuf op_vec[], u_short n) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Complex::op"); +#endif return ACE_SV_Semaphore_Simple::op (op_vec, (u_short) n + 2); } ASYS_INLINE int ACE_SV_Semaphore_Complex::control (int cmd, semun arg, u_short n) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Complex::control"); +#endif return ACE_SV_Semaphore_Simple::control (cmd, arg, (u_short) n + 2); } ASYS_INLINE int ACE_SV_Semaphore_Complex::control (int cmd, int value, u_short n) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Complex::control"); +#endif return ACE_SV_Semaphore_Simple::control (cmd, value, (u_short) n + 2); } diff --git a/ace/IPC/SV_Semaphore_Simple.h b/ace/IPC/SV_Semaphore_Simple.h index ac6126b2e8c..4a64eb9963f 100644 --- a/ace/IPC/SV_Semaphore_Simple.h +++ b/ace/IPC/SV_Semaphore_Simple.h @@ -151,7 +151,7 @@ protected: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SV_Semaphore_Simple.i" +#include "ace/IPC/SV_Semaphore_Simple.i" #endif #include "ace/post.h" diff --git a/ace/IPC/SV_Semaphore_Simple.i b/ace/IPC/SV_Semaphore_Simple.i index e18acd95a84..bd141c04e82 100644 --- a/ace/IPC/SV_Semaphore_Simple.i +++ b/ace/IPC/SV_Semaphore_Simple.i @@ -3,14 +3,18 @@ // SV_Semaphore_Simple.i -#include "ace/Trace.h" +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Trace.h" +#endif ASYS_INLINE int ACE_SV_Semaphore_Simple::control (int cmd, semun arg, u_short n) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Simple::control"); +#endif return this->internal_id_ == -1 ? -1 : ACE_OS::semctl (this->internal_id_, n, cmd, arg); } @@ -21,7 +25,9 @@ ACE_SV_Semaphore_Simple::control (int cmd, ASYS_INLINE int ACE_SV_Semaphore_Simple::close (void) { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Simple::close"); +#endif return this->init (); } @@ -30,7 +36,9 @@ ACE_SV_Semaphore_Simple::close (void) ASYS_INLINE int ACE_SV_Semaphore_Simple::op (sembuf op_vec[], u_short n) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Simple::op"); +#endif return this->internal_id_ == -1 ? -1 : ACE_OS::semop (this->internal_id_, op_vec, n); } @@ -42,21 +50,27 @@ ACE_SV_Semaphore_Simple::op (sembuf op_vec[], u_short n) const ASYS_INLINE int ACE_SV_Semaphore_Simple::acquire (u_short n, int flags) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Simple::acquire"); +#endif return this->op (-1, n, flags); } ASYS_INLINE int ACE_SV_Semaphore_Simple::acquire_read (u_short n, int flags) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Simple::acquire_read"); +#endif return this->acquire (n, flags); } ASYS_INLINE int ACE_SV_Semaphore_Simple::acquire_write (u_short n, int flags) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Simple::acquire_write"); +#endif return this->acquire (n, flags); } @@ -65,7 +79,9 @@ ACE_SV_Semaphore_Simple::acquire_write (u_short n, int flags) const ASYS_INLINE int ACE_SV_Semaphore_Simple::tryacquire (u_short n, int flags) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Simple::tryacquire"); +#endif return this->op (-1, n, flags | IPC_NOWAIT); } @@ -74,7 +90,9 @@ ACE_SV_Semaphore_Simple::tryacquire (u_short n, int flags) const ASYS_INLINE int ACE_SV_Semaphore_Simple::tryacquire_read (u_short n, int flags) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Simple::tryacquire_read"); +#endif return this->tryacquire (n, flags); } @@ -83,24 +101,30 @@ ACE_SV_Semaphore_Simple::tryacquire_read (u_short n, int flags) const ASYS_INLINE int ACE_SV_Semaphore_Simple::tryacquire_write (u_short n, int flags) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Simple::tryacquire_write"); +#endif return this->tryacquire (n, flags); } -// Increment ACE_SV_Semaphore by one. Dijkstra's V operation, +// Increment ACE_SV_Semaphore by one. Dijkstra V operation, // Tannenbaums UP operation. ASYS_INLINE int ACE_SV_Semaphore_Simple::release (u_short n, int flags) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Simple::release"); +#endif return this->op (1, n, flags); } ASYS_INLINE int ACE_SV_Semaphore_Simple::get_id (void) const { +#ifdef ACE_SUBSET_0 ACE_TRACE ("ACE_SV_Semaphore_Simple::get_id"); +#endif return this->internal_id_; } diff --git a/ace/Memory/Malloc.h b/ace/Memory/Malloc.h index 152bf827936..b93c0cbc1a8 100644 --- a/ace/Memory/Malloc.h +++ b/ace/Memory/Malloc.h @@ -20,14 +20,16 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#ifdef ACE_SUBSET_0 #include "ace/Log_Msg.h" +#endif #if defined (ACE_HAS_MALLOC_STATS) #if defined (ACE_HAS_THREADS) -#include "ace/Process_Mutex.h" +#include "ace/Threads/Process_Mutex.h" #define ACE_PROCESS_MUTEX ACE_Process_Mutex #else -#include "ace/SV_Semaphore_Simple.h" +#include "ace/IPC/SV_Semaphore_Simple.h" #define ACE_PROCESS_MUTEX ACE_SV_Semaphore_Simple #endif /* ACE_HAS_THREADS */ @@ -403,12 +405,12 @@ public: }; #if defined (__ACE_INLINE__) -#include "ace/Malloc.i" +#include "ace/Memory/Malloc.i" #endif /* __ACE_INLINE__ */ // Include the ACE_Malloc templates and ACE_Memory_Pool classes at this point. -#include "ace/Malloc_T.h" -#include "ace/Memory_Pool.h" +#include "ace/Memory/Malloc_T.h" +#include "ace/Memory/Memory_Pool.h" #include "ace/post.h" #endif /* ACE_MALLOC_H */ diff --git a/ace/Memory/Malloc_Allocator.h b/ace/Memory/Malloc_Allocator.h index b932adb74f4..753c3443b93 100644 --- a/ace/Memory/Malloc_Allocator.h +++ b/ace/Memory/Malloc_Allocator.h @@ -20,15 +20,18 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Malloc_Base.h" +#include "ace/Memory/Malloc_Base.h" + +#ifdef ACE_SUBSET_0 #include "ace/Log_Msg.h" +#endif #if defined (ACE_HAS_MALLOC_STATS) -#include "ace/Synch_T.h" +#include "ace/Threads/Synch_T.h" #if defined (ACE_HAS_THREADS) #define ACE_PROCESS_MUTEX ACE_Process_Mutex #else -#include "ace/SV_Semaphore_Simple.h" +#include "ace/IPC/SV_Semaphore_Simple.h" #define ACE_PROCESS_MUTEX ACE_SV_Semaphore_Simple #endif /* ACE_HAS_THREADS */ @@ -154,7 +157,7 @@ protected: }; #if defined (__ACE_INLINE__) -#include "ace/Malloc_Allocator.i" +#include "ace/Memory/Malloc_Allocator.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/Memory/Malloc_Base.h b/ace/Memory/Malloc_Base.h index 3b9f5c7161f..344c77a8e36 100644 --- a/ace/Memory/Malloc_Base.h +++ b/ace/Memory/Malloc_Base.h @@ -15,7 +15,7 @@ #define ACE_MALLOC_BASE_H #include "ace/pre.h" -#include "ace/OS.h" +#include "ace/OS/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Memory/Malloc_T.cpp b/ace/Memory/Malloc_T.cpp index 3eccefe3a5c..c5e23a9c845 100644 --- a/ace/Memory/Malloc_T.cpp +++ b/ace/Memory/Malloc_T.cpp @@ -4,14 +4,14 @@ #ifndef ACE_MALLOC_T_C #define ACE_MALLOC_T_C -#include "ace/Malloc_T.h" +#include "ace/Memory/Malloc_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !defined (__ACE_INLINE__) -#include "ace/Malloc_T.i" +#include "ace/Memory/Malloc_T.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Malloc_T, "$Id$") diff --git a/ace/Memory/Malloc_T.h b/ace/Memory/Malloc_T.h index bc8c42cd66f..643acb6b924 100644 --- a/ace/Memory/Malloc_T.h +++ b/ace/Memory/Malloc_T.h @@ -20,10 +20,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Synch.h" -#include "ace/Malloc.h" /* Need ACE_Control_Block */ -#include "ace/Malloc_Allocator.h" -#include "ace/Free_List.h" +#include "ace/Threads/Synch.h" +#include "ace/Memory/Malloc.h" /* Need ACE_Control_Block */ +#include "ace/Memory/Malloc_Allocator.h" +#include "ace/Utils/Templates/Free_List.h" /** * @class ACE_Cached_Mem_Pool_Node @@ -715,11 +715,11 @@ public: }; #if defined (__ACE_INLINE__) -#include "ace/Malloc_T.i" +#include "ace/Memory/Malloc_T.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Malloc_T.cpp" +#include "ace/Memory/Malloc_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ace/Memory/Mem_Map.h b/ace/Memory/Mem_Map.h index 8a0927fc418..b51c9948af0 100644 --- a/ace/Memory/Mem_Map.h +++ b/ace/Memory/Mem_Map.h @@ -207,7 +207,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/Mem_Map.i" +#include "ace/Memory/Mem_Map.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/Memory/Memory_Pool.h b/ace/Memory/Memory_Pool.h index 896887bc886..bfc1ad287bb 100644 --- a/ace/Memory/Memory_Pool.h +++ b/ace/Memory/Memory_Pool.h @@ -19,14 +19,14 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Event_Handler.h" -#include "ace/Signal.h" -#include "ace/Mem_Map.h" +#include "ace/Demux/Event_Handler.h" +#include "ace/IPC/Signal.h" +#include "ace/Memory/Mem_Map.h" #if !defined (ACE_WIN32) -#include "ace/SV_Semaphore_Complex.h" +#include "ace/IPC/SV_Semaphore_Complex.h" #endif /* !ACE_WIN32 */ -#include "ace/Unbounded_Set.h" +#include "ace/Utils/Unbounded_Set.h" #if !defined (ACE_LACKS_SBRK) /** @@ -749,7 +749,7 @@ private: #endif /* ACE_WIN32 */ #if defined (__ACE_INLINE__) -#include "ace/Memory_Pool.i" +#include "ace/Memory/Memory_Pool.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/Svcconf/Service_Object.h b/ace/Svcconf/Service_Object.h index 2801a8be3c4..20264866ff3 100644 --- a/ace/Svcconf/Service_Object.h +++ b/ace/Svcconf/Service_Object.h @@ -14,13 +14,13 @@ #define ACE_SERVICE_OBJECT_H #include "ace/pre.h" -#include "ace/Shared_Object.h" +#include "ace/Svcconf/Shared_Object.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Event_Handler.h" +#include "ace/Demux/Event_Handler.h" #define ACE_Component ACE_Service_Object /** @@ -157,7 +157,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/Service_Object.i" +#include "ace/Svcconf/Service_Object.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/Svcconf/Shared_Object.h b/ace/Svcconf/Shared_Object.h index dc6d1ed7480..b3adda83d4a 100644 --- a/ace/Svcconf/Shared_Object.h +++ b/ace/Svcconf/Shared_Object.h @@ -44,7 +44,7 @@ public: }; #if defined (__ACE_INLINE__) -#include "ace/Shared_Object.i" +#include "ace/Svcconf/Shared_Object.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/Timer/Timer_Heap.h b/ace/Timer/Timer_Heap.h index 5db29677f75..8773ff39e6d 100644 --- a/ace/Timer/Timer_Heap.h +++ b/ace/Timer/Timer_Heap.h @@ -15,7 +15,7 @@ #define ACE_TIMER_HEAP_H #include "ace/pre.h" -#include "ace/Timer_Heap_T.h" +#include "ace/Timer/Timer_Heap_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Timer/Timer_Heap_T.cpp b/ace/Timer/Timer_Heap_T.cpp index c3596238621..e60c9ee74c0 100644 --- a/ace/Timer/Timer_Heap_T.cpp +++ b/ace/Timer/Timer_Heap_T.cpp @@ -3,8 +3,11 @@ #ifndef ACE_TIMER_HEAP_T_C #define ACE_TIMER_HEAP_T_C -#include "ace/Timer_Heap_T.h" +#include "ace/Timer/Timer_Heap_T.h" + +#ifdef ACE_SUBSET_0 #include "ace/Log_Msg.h" +#endif #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -292,6 +295,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::earliest_time (void) const return this->heap_[0]->get_timer_value (); } +#ifdef ACE_SUBSET_0 template <class TYPE, class FUNCTOR, class ACE_LOCK> void ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const { @@ -326,6 +330,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } +#endif template <class TYPE, class FUNCTOR, class ACE_LOCK> void ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::copy (int slot, diff --git a/ace/Timer/Timer_Heap_T.h b/ace/Timer/Timer_Heap_T.h index 6039225e797..75c7d8d41e1 100644 --- a/ace/Timer/Timer_Heap_T.h +++ b/ace/Timer/Timer_Heap_T.h @@ -14,14 +14,14 @@ #define ACE_TIMER_HEAP_T_H #include "ace/pre.h" -#include "ace/Timer_Queue_T.h" +#include "ace/Timer/Timer_Queue_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Free_List.h" -#include "ace/Unbounded_Set.h" +#include "ace/Utils/Templates/Free_List.h" +#include "ace/Utils/Unbounded_Set.h" // Forward declaration template <class TYPE, class FUNCTOR, class ACE_LOCK> @@ -318,7 +318,7 @@ private: }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined(ACE_HAS_BROKEN_HPUX_TEMPLATES) -#include "ace/Timer_Heap_T.cpp" +#include "ace/Timer/Timer_Heap_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE && !ACE_HAS_BROKEN_HPUX_TEMPLATES */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ace/Timer/Timer_Queue_T.cpp b/ace/Timer/Timer_Queue_T.cpp index 166e35c60e6..f15ec8679cc 100644 --- a/ace/Timer/Timer_Queue_T.cpp +++ b/ace/Timer/Timer_Queue_T.cpp @@ -3,15 +3,18 @@ #ifndef ACE_TIMER_QUEUE_T_C #define ACE_TIMER_QUEUE_T_C -#include "ace/Synch.h" +#include "ace/Threads/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Signal.h" -#include "ace/Timer_Queue_T.h" +#include "ace/IPC/Signal.h" +#include "ace/Timer/Timer_Queue_T.h" + +#ifdef ACE_SUBSET_0 #include "ace/Log_Msg.h" +#endif #if !defined (__ACE_INLINE__) #include "ace/Timer_Queue_T.i" @@ -19,6 +22,7 @@ ACE_RCSID(ace, Timer_Queue_T, "$Id$") +#ifdef ACE_SUBSET_0 template <class TYPE> void ACE_Timer_Node_T<TYPE>::dump (void) const { @@ -32,6 +36,7 @@ ACE_Timer_Node_T<TYPE>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntimer_id_ = %d\n"), this->timer_id_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } +#endif template <class TYPE> ACE_Timer_Node_T<TYPE>::ACE_Timer_Node_T (void) @@ -145,6 +150,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::calculate_timeout (ACE_Time_Value *m return the_timeout; } +#ifdef ACE_DEBUG_0 template <class TYPE, class FUNCTOR, class ACE_LOCK> void ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const { @@ -154,6 +160,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const this->timer_skew_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } +#endif template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Queue_T (FUNCTOR *upcall_functor, diff --git a/ace/Utils/ARGV.cpp b/ace/Utils/ARGV.cpp index 8fb4668518d..25f4d2fcf95 100644 --- a/ace/Utils/ARGV.cpp +++ b/ace/Utils/ARGV.cpp @@ -3,17 +3,21 @@ // Transforms a string BUF into an ARGV-style vector of strings. -#include "ace/ARGV.h" +#include "ace/Utils/ARGV.h" + +#ifdef ACE_SUBSET_0 #include "ace/Log_Msg.h" +#endif #if !defined (__ACE_INLINE__) -#include "ace/ARGV.i" +#include "ace/Utils/ARGV.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, ARGV, "$Id$") ACE_ALLOC_HOOK_DEFINE (ACE_ARGV) +#ifdef ACE_SUBSET_0 void ACE_ARGV::dump (void) const { @@ -34,6 +38,7 @@ ACE_ARGV::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } +#endif // Creates this->argv_ out of this->buf_. New memory is allocated for // each element of the array. This is used by the array-to-string @@ -78,10 +83,14 @@ ACE_ARGV::ACE_ARGV (const ACE_TCHAR buf[], ACE_OS::strcpy (this->buf_, buf); // Create this->argv_. +#ifdef ACE_SUBSET_0 if (this->string_to_argv () == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("string_to_argv"))); +#else + this->string_to_argv (); +#endif } ACE_ARGV::ACE_ARGV (ACE_TCHAR *argv[], @@ -231,9 +240,11 @@ ACE_ARGV::add (const ACE_TCHAR *next_arg) // Put the new argument at the end of the queue. if (this->queue_.enqueue_tail ((ACE_TCHAR *) next_arg) == -1) +#ifdef ACE_SUBSET_0 ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("Can't add more to ARGV queue")), -1); +#endif this->length_ += ACE_OS::strlen (next_arg); diff --git a/ace/Utils/ARGV.h b/ace/Utils/ARGV.h index 613af430fed..8c49d27d4d8 100644 --- a/ace/Utils/ARGV.h +++ b/ace/Utils/ARGV.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Unbounded_Queue.h" +#include "ace/Utils/Unbounded_Queue.h" /** * @class ACE_ARGV @@ -162,7 +162,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/ARGV.i" +#include "ace/Utils/ARGV.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/Utils/Arg_Shifter.cpp b/ace/Utils/Arg_Shifter.cpp index 2fc8aca6a96..df674e26b5c 100644 --- a/ace/Utils/Arg_Shifter.cpp +++ b/ace/Utils/Arg_Shifter.cpp @@ -1,7 +1,7 @@ // $Id$ // #include "ace/OS.h" -#include "ace/Arg_Shifter.h" +#include "ace/Utils/Arg_Shifter.h" ACE_RCSID(ace, Arg_Shifter, "$Id$") diff --git a/ace/Utils/Arg_Shifter.h b/ace/Utils/Arg_Shifter.h index 8a6ab8222fc..5fd8f7a7b96 100644 --- a/ace/Utils/Arg_Shifter.h +++ b/ace/Utils/Arg_Shifter.h @@ -14,7 +14,7 @@ #define ACE_ARG_SHIFTER_H #include "ace/pre.h" -#include "ace/OS.h" +#include "ace/OS/OS.h" /** * @class ACE_Arg_Shifter diff --git a/ace/Utils/Capabilities.cpp b/ace/Utils/Capabilities.cpp index 9257178d486..c019da919bd 100644 --- a/ace/Utils/Capabilities.cpp +++ b/ace/Utils/Capabilities.cpp @@ -1,11 +1,14 @@ // $Id$ -#include "ace/Map_Manager.h" -#include "ace/Capabilities.h" +#include "ace/Utils/Templates/Map_Manager.h" +#include "ace/Utils/Capabilities.h" + +#ifdef ACE_SUBSET_0 #include "ace/Log_Msg.h" +#endif #if !defined (__ACE_INLINE__) -#include "ace/Capabilities.i" +#include "ace/Utils/Capabilities.i" #endif /* !__ACE_INLINE__ */ #define ACE_ESC ((ACE_TCHAR)0x1b) @@ -214,8 +217,10 @@ ACE_Capabilities::is_entry (const ACE_TCHAR *name, const ACE_TCHAR *line) line++; else { +#ifdef ACE_SUBSET_0 ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Invalid entry\n"))); +#endif break; } } @@ -304,11 +309,13 @@ ACE_Capabilities::getent (const ACE_TCHAR *fname, const ACE_TCHAR *name) { FILE *fp = ACE_OS::fopen (fname, ACE_LIB_TEXT ("r")); +#ifdef ACE_SUBSET_0 if (fp == 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("Can't open %s file\n"), fname), -1); +#endif int done; ACE_TString line; diff --git a/ace/Utils/Capabilities.h b/ace/Utils/Capabilities.h index 03fc25242e6..4f729b5fae7 100644 --- a/ace/Utils/Capabilities.h +++ b/ace/Utils/Capabilities.h @@ -15,11 +15,11 @@ #define ACE_CAPABILITIES_H #include "ace/pre.h" -#include "ace/OS.h" -#include "ace/Synch.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Containers.h" -#include "ace/SString.h" +#include "ace/OS/OS.h" +#include "ace/Threads/Synch.h" +#include "ace/Utils/Hash_Map_Manager.h" +#include "ace/Utils/Containers.h" +#include "ace/Utils/SString.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -192,7 +192,7 @@ is_line (const ACE_TCHAR *line) #endif /* ACE_IS_SPLITTING */ #if defined (__ACE_INLINE__) -#include "ace/Capabilities.i" +#include "ace/Utils/Capabilities.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/Utils/Containers.h b/ace/Utils/Containers.h index 5e28cc43c8e..87a94a9b818 100644 --- a/ace/Utils/Containers.h +++ b/ace/Utils/Containers.h @@ -14,8 +14,8 @@ #define ACE_CONTAINERS_H #include "ace/pre.h" -#include "ace/OS.h" -#include "ace/Malloc_Base.h" +#include "ace/OS/OS.h" +#include "ace/Memory/Malloc_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -63,10 +63,10 @@ protected: }; #if defined (__ACE_INLINE__) -#include "ace/Containers.i" +#include "ace/Utils/Containers.i" #endif /* __ACE_INLINE__ */ -#include "ace/Containers_T.h" +#include "ace/Utils/Templates/Containers_T.h" #include "ace/post.h" #endif /* ACE_CONTAINERS_H */ diff --git a/ace/Utils/Functor.h b/ace/Utils/Functor.h index 5e96d5cbad5..cb87f4b248e 100644 --- a/ace/Utils/Functor.h +++ b/ace/Utils/Functor.h @@ -353,11 +353,11 @@ public: }; #if defined (__ACE_INLINE__) -#include "ace/Functor.i" +#include "ace/Utils/Functor.i" #endif /* __ACE_INLINE__ */ // Include the templates here. -#include "ace/Functor_T.h" +#include "ace/Utils/Functor_T.h" #include "ace/post.h" #endif /* ACE_FUNCTOR_H */ diff --git a/ace/Utils/Functor_T.cpp b/ace/Utils/Functor_T.cpp index 73b183d0fd3..f4b46935fa8 100644 --- a/ace/Utils/Functor_T.cpp +++ b/ace/Utils/Functor_T.cpp @@ -4,14 +4,14 @@ #ifndef ACE_FUNCTOR_T_C #define ACE_FUNCTOR_T_C -#include "ace/Functor_T.h" +#include "ace/Utils/Functor_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !defined (__ACE_INLINE__) -#include "ace/Functor_T.i" +#include "ace/Utils/Functor_T.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Functor_T, "$Id$") diff --git a/ace/Utils/Functor_T.h b/ace/Utils/Functor_T.h index 32101c32abe..b06af17a3ac 100644 --- a/ace/Utils/Functor_T.h +++ b/ace/Utils/Functor_T.h @@ -30,7 +30,7 @@ #define ACE_FUNCTOR_T_H #include "ace/pre.h" -#include "ace/Functor.h" +#include "ace/Utils/Functor.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -136,12 +136,12 @@ public: }; #if defined (__ACE_INLINE__) -#include "ace/Functor_T.i" +#include "ace/Utils/Functor_T.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Functor_T.cpp" +#include "ace/Utils/Functor_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ace/Utils/Hash_Map_Manager.h b/ace/Utils/Hash_Map_Manager.h index dc2b7fce755..32f37698bec 100644 --- a/ace/Utils/Hash_Map_Manager.h +++ b/ace/Utils/Hash_Map_Manager.h @@ -14,15 +14,15 @@ #define ACE_HASH_MAP_MANAGER_H #include "ace/pre.h" -#include "ace/OS.h" -#include "ace/Functor.h" +#include "ace/OS/OS.h" +#include "ace/Utils/Functor.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // Include the templates here. -#include "ace/Hash_Map_Manager_T.h" +#include "ace/Utils/Templates/Hash_Map_Manager_T.h" #include "ace/post.h" #endif /* ACE_HASH_MAP_MANAGER_H */ diff --git a/ace/Utils/Makefile b/ace/Utils/Makefile index 3302acd997e..19053d6b4b6 100644 --- a/ace/Utils/Makefile +++ b/ace/Utils/Makefile @@ -1,29 +1,20 @@ # $Id$ #---------------------------------------------------------------------------- -# Makefile for the libACE_Utils +# Makefile for the libACE_OS #---------------------------------------------------------------------------- MAKEFILE = Makefile -LIBOS = libACE_Utils -LIB = $(LIBOS).a -SHLIB = $(LIBOS).$(SOEXT) +LIBNAME = libACE_Utils +LIB = $(LIBNAME).a +SHLIB = $(LIBNAME).$(SOEXT) -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU - -#### -#### ACE_COMPONENTS support. -#### -FILES += \ - ACE \ +FILES = \ + ARGV\ Active_Map_Manager\ Active_Map_Manager_T\ Arg_Shifter\ - ARGV\ Capabilities\ Configuration\ Configuration_Import_Export\ @@ -39,10 +30,10 @@ FILES += \ Future\ Future_Set\ Get_Opt\ - Hashable\ Hash_Map_Manager\ - Init_ACE\ + Hashable\ IO_Cntl_Msg\ + Init_ACE\ Lib_Find\ Map\ Message_Block\ @@ -54,14 +45,23 @@ FILES += \ Recyclable\ Refcountable\ Registry\ - Sample_History\ SString\ + Sample_History\ Stats\ String_Base_Const\ Test_and_Set\ Unbounded_Queue\ Unbounded_Set +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU + +#### +#### ACE_COMPONENTS support. +#### LSRC = $(addsuffix .cpp,$(FILES)) @@ -74,7 +74,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU INSTALL = clean: - $(RM) -f $(LIBOS).a $(LIBOS).so + $(RM) -f $(LIBNAME).a $(LIBNAME).so #---------------------------------------------------------------------------- # Local targets @@ -87,3 +87,6 @@ clean: #---------------------------------------------------------------------------- # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + + diff --git a/ace/Utils/SString.h b/ace/Utils/SString.h index ead805a494f..0cdc9100422 100644 --- a/ace/Utils/SString.h +++ b/ace/Utils/SString.h @@ -14,7 +14,7 @@ #define ACE_SSTRING_H #include "ace/pre.h" -#include "ace/String_Base.h" +#include "ace/Utils/Templates/String_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -472,7 +472,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/SString.i" +#include "ace/Utils/SString.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/Utils/SString.i b/ace/Utils/SString.i index 247812da5a4..f18484abd05 100644 --- a/ace/Utils/SString.i +++ b/ace/Utils/SString.i @@ -1,7 +1,7 @@ /* -*- C++ -*- */ // $Id$ -#include "ace/Malloc_Base.h" +#include "ace/Memory/Malloc_Base.h" ACE_INLINE ACE_NS_WString::ACE_NS_WString (ACE_Allocator *alloc) diff --git a/ace/Utils/Templates/Array_Base.cpp b/ace/Utils/Templates/Array_Base.cpp index 00bf8193bf0..60e852f4002 100644 --- a/ace/Utils/Templates/Array_Base.cpp +++ b/ace/Utils/Templates/Array_Base.cpp @@ -3,15 +3,15 @@ #ifndef ACE_ARRAY_BASE_C #define ACE_ARRAY_BASE_C -#include "ace/Array_Base.h" -#include "ace/Malloc_Base.h" +#include "ace/Utils/Templates/Array_Base.h" +#include "ace/Memory/Malloc_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !defined (__ACE_INLINE__) -#include "ace/Array_Base.inl" +#include "ace/Utils/Templates/Array_Base.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Array_Base, "$Id$") diff --git a/ace/Utils/Templates/Array_Base.h b/ace/Utils/Templates/Array_Base.h index de2a4a46136..ae23fb16694 100644 --- a/ace/Utils/Templates/Array_Base.h +++ b/ace/Utils/Templates/Array_Base.h @@ -191,11 +191,11 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/Array_Base.inl" +#include "ace/Utils/Templates/Array_Base.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Array_Base.cpp" +#include "ace/Utils/Templates/Array_Base.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ace/Utils/Templates/Auto_Ptr.cpp b/ace/Utils/Templates/Auto_Ptr.cpp index 888a65d02e7..2d6dbe17a30 100644 --- a/ace/Utils/Templates/Auto_Ptr.cpp +++ b/ace/Utils/Templates/Auto_Ptr.cpp @@ -4,10 +4,10 @@ #if !defined (ACE_AUTO_PTR_C) #define ACE_AUTO_PTR_C -#include "ace/Auto_Ptr.h" +#include "ace/Utils/Templates/Auto_Ptr.h" #if !defined (__ACE_INLINE__) -#include "ace/Auto_Ptr.i" +#include "ace/Utils/Templates/Auto_Ptr.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Auto_Ptr, "$Id$") diff --git a/ace/Utils/Templates/Auto_Ptr.h b/ace/Utils/Templates/Auto_Ptr.h index aa7e0eec35d..5655a774e31 100644 --- a/ace/Utils/Templates/Auto_Ptr.h +++ b/ace/Utils/Templates/Auto_Ptr.h @@ -17,7 +17,7 @@ #define ACE_AUTO_PTR_H #include "ace/pre.h" -#include "ace/OS.h" +#include "ace/OS/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -157,11 +157,11 @@ public: # endif /* ACE_AUTO_PTR_LACKS_RESET */ #if defined (__ACE_INLINE__) -#include "ace/Auto_Ptr.i" +#include "ace/Utils/Templates/Auto_Ptr.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Auto_Ptr.cpp" +#include "ace/Utils/Templates/Auto_Ptr.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ace/Utils/Templates/Containers_T.cpp b/ace/Utils/Templates/Containers_T.cpp index 7f6d0683368..3b79707f09f 100644 --- a/ace/Utils/Templates/Containers_T.cpp +++ b/ace/Utils/Templates/Containers_T.cpp @@ -3,17 +3,20 @@ #ifndef ACE_CONTAINERS_T_C #define ACE_CONTAINERS_T_C +#ifdef ACE_SUBSET_0 #include "ace/Log_Msg.h" -#include "ace/Malloc_Base.h" +#endif + +#include "ace/Memory/Malloc_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Containers.h" +#include "ace/Utils/Containers.h" #if !defined (__ACE_INLINE__) -#include "ace/Containers_T.i" +#include "ace/Utils/Templates/Containers_T.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Containers_T, "$Id$") diff --git a/ace/Utils/Templates/Containers_T.h b/ace/Utils/Templates/Containers_T.h index 9751c6ca132..17a79a197c4 100644 --- a/ace/Utils/Templates/Containers_T.h +++ b/ace/Utils/Templates/Containers_T.h @@ -21,19 +21,19 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ // Need by ACE_DLList_Node. -#include "ace/Containers.h" +#include "ace/Utils/Containers.h" // Shared with "ace/Unbounded_Set.h" -#include "ace/Node.h" +#include "ace/Utils/Templates/Node.h" // Backwards compatibility, please include "ace/Array_Base.h" directly. -#include "ace/Array_Base.h" +#include "ace/Utils/Templates/Array_Base.h" // Backwards compatibility, please include "ace/Unbounded_Set.h" directly. -#include "ace/Unbounded_Set.h" +#include "ace/Utils/Unbounded_Set.h" // Backwards compatibility, please include "ace/Unbounded_Queue.h" directly. -#include "ace/Unbounded_Queue.h" +#include "ace/Utils/Unbounded_Queue.h" class ACE_Allocator; @@ -1480,11 +1480,11 @@ public: }; #if defined (__ACE_INLINE__) -#include "ace/Containers_T.i" +#include "ace/Utils/Templates/Containers_T.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Containers_T.cpp" +#include "ace/Utils/Templates/Containers_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ace/Utils/Templates/Free_List.cpp b/ace/Utils/Templates/Free_List.cpp index 703e2f7f572..66a75eff065 100644 --- a/ace/Utils/Templates/Free_List.cpp +++ b/ace/Utils/Templates/Free_List.cpp @@ -3,7 +3,7 @@ #ifndef ACE_FREE_LIST_C #define ACE_FREE_LIST_C -#include "ace/Free_List.h" +#include "ace/Utils/Templates/Free_List.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Utils/Templates/Free_List.h b/ace/Utils/Templates/Free_List.h index 339cc9b9200..2af4270ea75 100644 --- a/ace/Utils/Templates/Free_List.h +++ b/ace/Utils/Templates/Free_List.h @@ -14,13 +14,13 @@ #define ACE_FREE_LIST_H #include "ace/pre.h" -#include "ace/OS.h" +#include "ace/OS/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Synch_T.h" +#include "ace/Threads/Synch_T.h" /** * @class ACE_Free_List @@ -133,11 +133,11 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/Free_List.i" +#include "ace/Utils/Templates/Free_List.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Free_List.cpp" +#include "ace/Utils/Templates/Free_List.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ace/Utils/Templates/Hash_Map_Manager_T.cpp b/ace/Utils/Templates/Hash_Map_Manager_T.cpp index 669ca4bc756..7d1134324bf 100644 --- a/ace/Utils/Templates/Hash_Map_Manager_T.cpp +++ b/ace/Utils/Templates/Hash_Map_Manager_T.cpp @@ -16,14 +16,14 @@ #ifndef ACE_HASH_MAP_MANAGER_T_CPP #define ACE_HASH_MAP_MANAGER_T_CPP -#include "ace/Hash_Map_Manager_T.h" +#include "ace/Utils/Templates/Hash_Map_Manager_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !defined (__ACE_INLINE__) -# include "ace/Hash_Map_Manager_T.i" +# include "ace/Utils/Templates/Hash_Map_Manager_T.i" #elif defined (__SUNPRO_CC) && (__SUNPRO_CC == 0x420) // If ACE_INLINE is on and we are on SunCC, undefine ACE_INLINE, // include ace/Hash_Map_Manager_T.i, and then redefine ACE_INLINE. @@ -31,14 +31,14 @@ // the code in ace/Hash_Map_Manager_T.i (with the fast option). # undef ACE_INLINE # define ACE_INLINE -# include "ace/Hash_Map_Manager_T.i" +# include "ace/Utils/Templates/Hash_Map_Manager_T.i" # undef ACE_INLINE # define ACE_INLINE inline #endif /* __ACE_INLINE__ */ -#include "ace/Synch.h" -#include "ace/Service_Config.h" -#include "ace/Malloc.h" +#include "ace/Threads/Synch.h" +#include "ace/Svcconf/Service_Config.h" +#include "ace/Memory/Malloc.h" ACE_RCSID(ace, Hash_Map_Manager_T, "$Id$") @@ -69,6 +69,7 @@ ACE_Hash_Map_Entry<EXT_ID, INT_ID>::~ACE_Hash_Map_Entry (void) } # endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */ +#ifdef ACE_SUBSET_0 template <class EXT_ID, class INT_ID> void ACE_Hash_Map_Entry<EXT_ID, INT_ID>::dump (void) const { @@ -88,6 +89,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump this->lock_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } +#endif /* ACE_SUBSET_0 */ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::create_buckets (size_t size) @@ -372,6 +374,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rebin ACE_ALLOC_HOOK_DEFINE(ACE_Hash_Map_Iterator_Base_Ex) +#ifdef ACE_SUBSET_0 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> void ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i (void) const { @@ -382,6 +385,7 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>: ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("next_ = %x"), this->next_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } +#endif /* ACE_SUBSET_0 */ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i (void) diff --git a/ace/Utils/Templates/Hash_Map_Manager_T.h b/ace/Utils/Templates/Hash_Map_Manager_T.h index 71bf90c10d1..2a5a591c3c4 100644 --- a/ace/Utils/Templates/Hash_Map_Manager_T.h +++ b/ace/Utils/Templates/Hash_Map_Manager_T.h @@ -14,9 +14,12 @@ #define ACE_HASH_MAP_MANAGER_T_H #include "ace/pre.h" -#include "ace/OS.h" -#include "ace/Functor.h" -#include "ace/Log_Msg.h" +#include "ace/OS/OS.h" +#include "ace/Utils/Functor.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -898,12 +901,12 @@ public: // This nonsense is necessary since SunCC (version 4.2) cannot inline // the code in ace/Hash_Map_Manager_T.i (with the fast option). # if !(defined (__SUNPRO_CC) && (__SUNPRO_CC == 0x420)) -# include "ace/Hash_Map_Manager_T.i" +# include "ace/Utils/Templates/Hash_Map_Manager_T.i" # endif /* ! __SUNPRO_CC */ #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Hash_Map_Manager_T.cpp" +#include "ace/Utils/Templates/Hash_Map_Manager_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ace/Utils/Templates/Hash_Map_Manager_T.i b/ace/Utils/Templates/Hash_Map_Manager_T.i index d57997a72bf..2d9c1eabf7b 100644 --- a/ace/Utils/Templates/Hash_Map_Manager_T.i +++ b/ace/Utils/Templates/Hash_Map_Manager_T.i @@ -1,6 +1,6 @@ // $Id$ -#include "ace/Synch.h" +#include "ace/Threads/Synch.h" template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_Hash_Map_Manager_Ex (size_t size, diff --git a/ace/Utils/Templates/Node.cpp b/ace/Utils/Templates/Node.cpp index 91e989d739b..1085a033c6b 100644 --- a/ace/Utils/Templates/Node.cpp +++ b/ace/Utils/Templates/Node.cpp @@ -3,7 +3,7 @@ #ifndef ACE_NODE_C #define ACE_NODE_C -#include "ace/Node.h" +#include "ace/Utils/Templates/Node.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Utils/Templates/Node.h b/ace/Utils/Templates/Node.h index 3d69213bf26..989d519ffc0 100644 --- a/ace/Utils/Templates/Node.h +++ b/ace/Utils/Templates/Node.h @@ -66,7 +66,7 @@ private: }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Node.cpp" +#include "ace/Utils/Templates/Node.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ace/Utils/Templates/String_Base.cpp b/ace/Utils/Templates/String_Base.cpp index 5277aed1b16..2229b11c3cf 100644 --- a/ace/Utils/Templates/String_Base.cpp +++ b/ace/Utils/Templates/String_Base.cpp @@ -1,15 +1,15 @@ // $Id$ -#include "ace/Malloc.h" -#include "ace/String_Base.h" -#include "ace/Auto_Ptr.h" +#include "ace/Memory/Malloc.h" +#include "ace/Utils/Templates/String_Base.h" +#include "ace/Utils/Templates/Auto_Ptr.h" #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) -# include "ace/streams.h" +# include "ace/Streams/streams.h" #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ #if !defined (__ACE_INLINE__) -#include "ace/String_Base.i" +#include "ace/Utils/Templates/String_Base.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, String_Base, "String_Base.cpp,v 4.61 2001/03/04 00:55:30 brunsch Exp") diff --git a/ace/Utils/Templates/String_Base.h b/ace/Utils/Templates/String_Base.h index 8cbe11f1783..40a97cbf98c 100644 --- a/ace/Utils/Templates/String_Base.h +++ b/ace/Utils/Templates/String_Base.h @@ -16,7 +16,7 @@ #include "ace/pre.h" #include "ace/ACE.h" -#include "ace/String_Base_Const.h" +#include "ace/Utils/String_Base_Const.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -220,11 +220,11 @@ template <class CHAR> ACE_INLINE ACE_String_Base<CHAR> operator + (const CHAR* , const ACE_String_Base<CHAR> &); #if defined (__ACE_INLINE__) -#include "ace/String_Base.i" +#include "ace/Utils/Templates/String_Base.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/String_Base.cpp" +#include "ace/Utils/Templates/String_Base.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ace/Utils/Templates/String_Base.i b/ace/Utils/Templates/String_Base.i index 63691853cf5..b1f11cd8505 100644 --- a/ace/Utils/Templates/String_Base.i +++ b/ace/Utils/Templates/String_Base.i @@ -1,7 +1,7 @@ /* -*- C++ -*- */ // $Id$ -#include "ace/Malloc_Base.h" +#include "ace/Memory/Malloc_Base.h" // Default constructor. diff --git a/ace/Utils/Test_and_Set.cpp b/ace/Utils/Test_and_Set.cpp index 73896eb387a..6378d147451 100644 --- a/ace/Utils/Test_and_Set.cpp +++ b/ace/Utils/Test_and_Set.cpp @@ -3,8 +3,8 @@ #ifndef ACE_TEST_AND_SET_C #define ACE_TEST_AND_SET_C -#include "ace/Test_and_Set.h" -#include "ace/Synch_T.h" +#include "ace/Utils/Test_and_Set.h" +#include "ace/Threads/Synch_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Utils/Test_and_Set.h b/ace/Utils/Test_and_Set.h index 4def53af1bd..89d9a9489e6 100644 --- a/ace/Utils/Test_and_Set.h +++ b/ace/Utils/Test_and_Set.h @@ -14,7 +14,7 @@ #define ACE_TEST_AND_SET_H #include "ace/pre.h" -#include "ace/Event_Handler.h" +#include "ace/Demux/Event_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -61,11 +61,11 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/Test_and_Set.i" +#include "ace/Utils/Test_and_Set.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Test_and_Set.cpp" +#include "ace/Utils/Test_and_Set.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ace/Utils/Unbounded_Queue.cpp b/ace/Utils/Unbounded_Queue.cpp index c5aad55fd31..0045cc2c2c5 100644 --- a/ace/Utils/Unbounded_Queue.cpp +++ b/ace/Utils/Unbounded_Queue.cpp @@ -3,16 +3,19 @@ #ifndef ACE_UNBOUNDED_QUEUE_C #define ACE_UNBOUNDED_QUEUE_C -#include "ace/Unbounded_Queue.h" -#include "ace/Malloc_Base.h" +#include "ace/Utils/Unbounded_Queue.h" +#include "ace/Memory/Malloc_Base.h" + +#ifdef ACE_SUBSET_0 #include "ace/Log_Msg.h" +#endif #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !defined (__ACE_INLINE__) -#include "ace/Unbounded_Queue.inl" +#include "ace/Utils/Unbounded_Queue.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Unbounded_Queue, "$Id$") @@ -81,6 +84,7 @@ ACE_Unbounded_Queue<T>::end (void) return ACE_Unbounded_Queue_Iterator<T> (*this, 1); } +#ifdef ACE_SUBSET_0 template <class T> void ACE_Unbounded_Queue<T>::dump (void) const { @@ -103,6 +107,7 @@ ACE_Unbounded_Queue<T>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } +#endif template <class T> void ACE_Unbounded_Queue<T>::copy_nodes (const ACE_Unbounded_Queue<T> &us) diff --git a/ace/Utils/Unbounded_Queue.h b/ace/Utils/Unbounded_Queue.h index e245ecc4738..49c327addb6 100644 --- a/ace/Utils/Unbounded_Queue.h +++ b/ace/Utils/Unbounded_Queue.h @@ -15,14 +15,14 @@ #define ACE_UNBOUNDED_QUEUE_H #include "ace/pre.h" -#include "ace/Node.h" +#include "ace/Utils/Templates/Node.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // For size_t under Chorus -#include "ace/OS_Memory.h" +#include "ace/OS/OS_Memory.h" class ACE_Allocator; @@ -219,11 +219,11 @@ protected: }; #if defined (__ACE_INLINE__) -#include "ace/Unbounded_Queue.inl" +#include "ace/Utils/Unbounded_Queue.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Unbounded_Queue.cpp" +#include "ace/Utils/Unbounded_Queue.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ace/Utils/Unbounded_Set.cpp b/ace/Utils/Unbounded_Set.cpp index e1cf0708e6a..6be82df6c64 100644 --- a/ace/Utils/Unbounded_Set.cpp +++ b/ace/Utils/Unbounded_Set.cpp @@ -3,16 +3,19 @@ #ifndef ACE_UNBOUNDED_SET_C #define ACE_UNBOUNDED_SET_C -#include "ace/Unbounded_Set.h" -#include "ace/Malloc_Base.h" +#include "ace/Utils/Unbounded_Set.h" +#include "ace/Memory/Malloc_Base.h" + +#ifdef ACE_SUBSET_0 #include "ace/Log_Msg.h" +#endif #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !defined (__ACE_INLINE__) -#include "ace/Unbounded_Set.inl" +#include "ace/Utils/Unbounded_Set.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Unbounded_Set, "$Id$") @@ -59,6 +62,7 @@ ACE_Unbounded_Set<T>::reset (void) this->delete_nodes (); } +#ifdef ACE_SUBSET_0 template <class T> void ACE_Unbounded_Set<T>::dump (void) const { @@ -81,6 +85,7 @@ ACE_Unbounded_Set<T>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } +#endif template <class T> void ACE_Unbounded_Set<T>::copy_nodes (const ACE_Unbounded_Set<T> &us) diff --git a/ace/Utils/Unbounded_Set.h b/ace/Utils/Unbounded_Set.h index 71eb5bb300d..61085653b89 100644 --- a/ace/Utils/Unbounded_Set.h +++ b/ace/Utils/Unbounded_Set.h @@ -14,7 +14,7 @@ #define ACE_UNBOUNDED_SET_H #include "ace/pre.h" -#include "ace/Node.h" +#include "ace/Utils/Templates/Node.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -242,11 +242,11 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/Unbounded_Set.inl" +#include "ace/Utils/Unbounded_Set.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Unbounded_Set.cpp" +#include "ace/Utils/Unbounded_Set.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) |