From 9405cbb60c92dfd1436fd63a5aba1677b2df2ecb Mon Sep 17 00:00:00 2001 From: storri Date: Fri, 18 Jan 2002 15:49:55 +0000 Subject: *** empty log message *** --- ace/Memory/Based_Pointer_Repository.cpp | 4 ++-- ace/Memory/Based_Pointer_Repository.h | 4 ++-- ace/Memory/Based_Pointer_T.cpp | 11 ++++++---- ace/Memory/Based_Pointer_T.h | 6 +++--- ace/Memory/MEM_Acceptor.cpp | 4 ++-- ace/Memory/MEM_Acceptor.h | 10 ++++----- ace/Memory/MEM_Addr.cpp | 11 +++++++--- ace/Memory/MEM_Addr.h | 4 ++-- ace/Memory/MEM_Connector.cpp | 6 ++++-- ace/Memory/MEM_Connector.h | 8 ++++---- ace/Memory/MEM_IO.cpp | 6 +++--- ace/Memory/MEM_IO.h | 16 +++++++-------- ace/Memory/MEM_SAP.cpp | 4 ++-- ace/Memory/MEM_SAP.h | 6 +++--- ace/Memory/MEM_Stream.cpp | 4 ++-- ace/Memory/MEM_Stream.h | 6 +++--- ace/Memory/MEM_Stream.i | 2 +- ace/Memory/Malloc.cpp | 8 ++++---- ace/Memory/Malloc_Allocator.cpp | 8 ++++---- ace/Memory/Malloc_Allocator.h | 2 +- ace/Memory/Malloc_Allocator.i | 9 +++++++++ ace/Memory/Malloc_Instantiations.cpp | 2 +- ace/Memory/Mem_Map.cpp | 36 +++++++++++++++++++++++++++++---- ace/Memory/Memory_Pool.cpp | 15 ++++++++------ ace/Memory/Obchunk.cpp | 4 ++-- ace/Memory/Obchunk.h | 4 ++-- ace/Memory/Obstack.cpp | 2 +- ace/Memory/Obstack.h | 2 +- ace/Memory/Obstack_T.cpp | 4 ++-- ace/Memory/Obstack_T.h | 6 +++--- ace/Memory/PI_Malloc.cpp | 10 ++++----- ace/Memory/PI_Malloc.h | 10 ++++----- ace/Memory/Read_Buffer.cpp | 6 +++--- ace/Memory/Read_Buffer.h | 4 ++-- ace/Memory/Shared_Memory.cpp | 2 +- ace/Memory/Shared_Memory_MM.cpp | 4 ++-- ace/Memory/Shared_Memory_MM.h | 6 +++--- ace/Memory/Shared_Memory_SV.cpp | 4 ++-- ace/Memory/Shared_Memory_SV.h | 6 +++--- ace/Threads/Process_Semaphore.cpp | 9 ++++++--- ace/Threads/Process_Semaphore.h | 6 +++--- 41 files changed, 167 insertions(+), 114 deletions(-) diff --git a/ace/Memory/Based_Pointer_Repository.cpp b/ace/Memory/Based_Pointer_Repository.cpp index ba1283fb41a..2435785c595 100644 --- a/ace/Memory/Based_Pointer_Repository.cpp +++ b/ace/Memory/Based_Pointer_Repository.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "ace/Map_Manager.h" -#include "ace/Based_Pointer_Repository.h" +#include "ace/Utils/Templates/Map_Manager.h" +#include "ace/Memory/Based_Pointer_Repository.h" class ACE_Based_Pointer_Repository_Rep { diff --git a/ace/Memory/Based_Pointer_Repository.h b/ace/Memory/Based_Pointer_Repository.h index 2b14c52fa9f..4dea63a48f4 100644 --- a/ace/Memory/Based_Pointer_Repository.h +++ b/ace/Memory/Based_Pointer_Repository.h @@ -16,7 +16,7 @@ #define ACE_BASED_POINTER_REPOSITORY_H #include "ace/pre.h" -#include "ace/OS.h" // Need ACE_Export +#include "ace/OS/OS.h" // Need ACE_Export // Forward decl., using the "Cheshire Cat" technique. class ACE_Based_Pointer_Repository_Rep; @@ -60,7 +60,7 @@ private: ACE_Based_Pointer_Repository_Rep *rep_; }; -#include "ace/Singleton.h" +#include "ace/Utils/Templates/Singleton.h" /// Provide a Singleton access point to the based pointer repository. typedef ACE_Singleton diff --git a/ace/Memory/Based_Pointer_T.cpp b/ace/Memory/Based_Pointer_T.cpp index 5bf6352b406..845a17d464b 100644 --- a/ace/Memory/Based_Pointer_T.cpp +++ b/ace/Memory/Based_Pointer_T.cpp @@ -3,14 +3,17 @@ #ifndef ACE_BASED_POINTER_T_CPP #define ACE_BASED_POINTER_T_CPP -#include "ace/Based_Pointer_T.h" -#include "ace/Based_Pointer_Repository.h" -#include "ace/Log_Msg.h" +#include "ace/Memory/Based_Pointer_T.h" +#include "ace/Memory/Based_Pointer_Repository.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif # define ACE_TRACEX(X) ACE_Trace ____ (ACE_LIB_TEXT (X), __LINE__, ACE_LIB_TEXT (__FILE__)) #if !defined (__ACE_INLINE__) -#include "ace/Based_Pointer_T.i" +#include "ace/Memory/Based_Pointer_T.i" #endif /* __ACE_INLINE__ */ template diff --git a/ace/Memory/Based_Pointer_T.h b/ace/Memory/Based_Pointer_T.h index c8a8dcf55be..eef6e97b567 100644 --- a/ace/Memory/Based_Pointer_T.h +++ b/ace/Memory/Based_Pointer_T.h @@ -15,7 +15,7 @@ #define ACE_BASED_POINTER_T_H #include "ace/pre.h" -#include "ace/OS.h" // Need ACE_Export +#include "ace/OS/OS.h" // Need ACE_Export #if defined (_MSC_VER) // Suppress warning e.g. "return type for @@ -183,11 +183,11 @@ public: }; #if defined (__ACE_INLINE__) -#include "ace/Based_Pointer_T.i" +#include "ace/Memory/Based_Pointer_T.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Based_Pointer_T.cpp" +#include "ace/Memory/Based_Pointer_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ace/Memory/MEM_Acceptor.cpp b/ace/Memory/MEM_Acceptor.cpp index 0124fca8836..fe86811f4c4 100644 --- a/ace/Memory/MEM_Acceptor.cpp +++ b/ace/Memory/MEM_Acceptor.cpp @@ -1,12 +1,12 @@ // MEM_Acceptor.cpp // $Id$ -#include "ace/MEM_Acceptor.h" +#include "ace/Memory/MEM_Acceptor.h" #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/MEM_Acceptor.i" +#include "ace/Memory/MEM_Acceptor.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ ACE_RCSID(ace, MEM_Acceptor, "$Id$") diff --git a/ace/Memory/MEM_Acceptor.h b/ace/Memory/MEM_Acceptor.h index b1521e3451f..f98cd222f70 100644 --- a/ace/Memory/MEM_Acceptor.h +++ b/ace/Memory/MEM_Acceptor.h @@ -15,7 +15,7 @@ #define ACE_MEM_ACCEPTOR_H #include "ace/pre.h" -#include "ace/SOCK_Acceptor.h" +#include "ace/Sockets/SOCK_Acceptor.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,9 +23,9 @@ #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) -#include "ace/MEM_Stream.h" -#include "ace/MEM_Addr.h" -#include "ace/OS_QoS.h" +#include "ace/Memory/MEM_Stream.h" +#include "ace/Memory/MEM_Addr.h" +#include "ace/OS/OS_QoS.h" // Forward decl. class ACE_Reactor; @@ -164,7 +164,7 @@ private: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/MEM_Acceptor.i" +#include "ace/Memory/MEM_Acceptor.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ diff --git a/ace/Memory/MEM_Addr.cpp b/ace/Memory/MEM_Addr.cpp index 77363d66c4e..1a77fe5f386 100644 --- a/ace/Memory/MEM_Addr.cpp +++ b/ace/Memory/MEM_Addr.cpp @@ -2,13 +2,16 @@ // Defines the Internet domain address family address format. -#include "ace/MEM_Addr.h" -#include "ace/Log_Msg.h" +#include "ace/Memory/MEM_Addr.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) #if !defined (__ACE_INLINE__) -#include "ace/MEM_Addr.i" +#include "ace/Memory/MEM_Addr.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, MEM_Addr, "$Id$") @@ -139,6 +142,7 @@ ACE_MEM_Addr::get_host_name (void) const return this->external_.get_host_name (); } +#ifdef ACE_SUBSET_0 void ACE_MEM_Addr::dump (void) const { @@ -149,5 +153,6 @@ ACE_MEM_Addr::dump (void) const this->internal_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } +#endif #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ diff --git a/ace/Memory/MEM_Addr.h b/ace/Memory/MEM_Addr.h index d13aa45479c..75564d0c3e9 100644 --- a/ace/Memory/MEM_Addr.h +++ b/ace/Memory/MEM_Addr.h @@ -23,7 +23,7 @@ #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) -#include "ace/INET_Addr.h" +#include "ace/IPC/INET_Addr.h" /** * @class ACE_MEM_Addr @@ -144,7 +144,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/MEM_Addr.i" +#include "ace/Memory/MEM_Addr.i" #endif /* __ACE_INLINE__ */ #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ diff --git a/ace/Memory/MEM_Connector.cpp b/ace/Memory/MEM_Connector.cpp index 617c479e978..6d61b027537 100644 --- a/ace/Memory/MEM_Connector.cpp +++ b/ace/Memory/MEM_Connector.cpp @@ -1,18 +1,19 @@ // MEM_Connector.cpp // $Id$ -#include "ace/MEM_Connector.h" +#include "ace/Memory/MEM_Connector.h" ACE_RCSID(ace, MEM_Connector, "$Id$") #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/MEM_Connector.i" +#include "ace/Memory/MEM_Connector.i" #endif ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Connector) +#ifdef ACE_SUBSET_0 void ACE_MEM_Connector::dump (void) const { @@ -22,6 +23,7 @@ ACE_MEM_Connector::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } +#endif ACE_MEM_Connector::ACE_MEM_Connector (void) : malloc_options_ (ACE_DEFAULT_BASE_ADDR, 0), diff --git a/ace/Memory/MEM_Connector.h b/ace/Memory/MEM_Connector.h index 900619bd539..54f8bf8da06 100644 --- a/ace/Memory/MEM_Connector.h +++ b/ace/Memory/MEM_Connector.h @@ -14,7 +14,7 @@ #define ACE_MEM_CONNECTOR_H #include "ace/pre.h" -#include "ace/SOCK_Connector.h" +#include "ace/Sockets/SOCK_Connector.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,8 +22,8 @@ #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) -#include "ace/MEM_Stream.h" -#include "ace/MEM_Addr.h" +#include "ace/Memory/MEM_Stream.h" +#include "ace/Memory/MEM_Addr.h" /** * @class ACE_MEM_Connector @@ -116,7 +116,7 @@ private: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/MEM_Connector.i" +#include "ace/Memory/MEM_Connector.i" #endif #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ diff --git a/ace/Memory/MEM_IO.cpp b/ace/Memory/MEM_IO.cpp index 65f5b439943..42329b18ec4 100644 --- a/ace/Memory/MEM_IO.cpp +++ b/ace/Memory/MEM_IO.cpp @@ -1,13 +1,13 @@ // MEM_IO.cpp // $Id$ -#include "ace/MEM_IO.h" -#include "ace/Handle_Set.h" +#include "ace/Memory/MEM_IO.h" +#include "ace/OS/Handle_Set.h" #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/MEM_IO.i" +#include "ace/Memory/MEM_IO.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ ACE_RCSID(ace, MEM_IO, "$Id$") diff --git a/ace/Memory/MEM_IO.h b/ace/Memory/MEM_IO.h index 101f41e6256..cd6ba0f87f8 100644 --- a/ace/Memory/MEM_IO.h +++ b/ace/Memory/MEM_IO.h @@ -15,12 +15,12 @@ #define ACE_MEM_IO_H #include "ace/pre.h" -#include "ace/SOCK.h" -#include "ace/MEM_SAP.h" -#include "ace/Memory_Pool.h" -#include "ace/Message_Block.h" -#include "ace/Process_Semaphore.h" -#include "ace/Process_Mutex.h" +#include "ace/Sockets/SOCK.h" +#include "ace/Memory/MEM_SAP.h" +#include "ace/Memory/Memory_Pool.h" +#include "ace/Utils/Message_Block.h" +#include "ace/Threads/Process_Semaphore.h" +#include "ace/Threads/Process_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -287,12 +287,12 @@ private: /// Record the current total buffer size of . ssize_t buf_size_; - /// Record the current read pointer location in . + //i Record the current read pointer location in . ssize_t cur_offset_; }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/MEM_IO.i" +#include "ace/Memory/MEM_IO.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ diff --git a/ace/Memory/MEM_SAP.cpp b/ace/Memory/MEM_SAP.cpp index 3031578e046..e45ec1dee24 100644 --- a/ace/Memory/MEM_SAP.cpp +++ b/ace/Memory/MEM_SAP.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "ace/MEM_SAP.h" +#include "ace/Memory/MEM_SAP.h" #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/MEM_SAP.i" +#include "ace/Memory/MEM_SAP.i" #endif ACE_RCSID(ace, MEM_SAP, "$Id$") diff --git a/ace/Memory/MEM_SAP.h b/ace/Memory/MEM_SAP.h index f3e7f4e91f5..147ec2cc111 100644 --- a/ace/Memory/MEM_SAP.h +++ b/ace/Memory/MEM_SAP.h @@ -15,7 +15,7 @@ #define ACE_MEM_SAP_H #include "ace/pre.h" -#include "ace/PI_Malloc.h" +#include "ace/Memory/PI_Malloc.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,7 +24,7 @@ // MEM_SAP requries position independent pointers to work #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) -#include "ace/Process_Mutex.h" +#include "ace/Threads/Process_Mutex.h" class ACE_MEM_SAP; class ACE_Reactive_MEM_IO; @@ -152,7 +152,7 @@ protected: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/MEM_SAP.i" +#include "ace/Memory/MEM_SAP.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ diff --git a/ace/Memory/MEM_Stream.cpp b/ace/Memory/MEM_Stream.cpp index 79b37e21838..382d5e9856b 100644 --- a/ace/Memory/MEM_Stream.cpp +++ b/ace/Memory/MEM_Stream.cpp @@ -1,11 +1,11 @@ // MEM_Stream.cpp // $Id$ -#include "ace/MEM_Stream.h" +#include "ace/Memory/MEM_Stream.h" #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/MEM_Stream.i" +#include "ace/Memory/MEM_Stream.i" #endif ACE_RCSID(ace, MEM_Stream, "$Id$") diff --git a/ace/Memory/MEM_Stream.h b/ace/Memory/MEM_Stream.h index 24cfbce2733..b1dc26e974f 100644 --- a/ace/Memory/MEM_Stream.h +++ b/ace/Memory/MEM_Stream.h @@ -15,7 +15,7 @@ #define ACE_MEM_STREAM_H #include "ace/pre.h" -#include "ace/MEM_IO.h" +#include "ace/Memory/MEM_IO.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,7 +23,7 @@ #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) -#include "ace/INET_Addr.h" +#include "ace/IPC/INET_Addr.h" class ACE_MEM_Acceptor; class ACE_MEM_Connector; @@ -133,7 +133,7 @@ public: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/MEM_Stream.i" +#include "ace/Memory/MEM_Stream.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ diff --git a/ace/Memory/MEM_Stream.i b/ace/Memory/MEM_Stream.i index 07f68fafdd0..75f921f77d4 100644 --- a/ace/Memory/MEM_Stream.i +++ b/ace/Memory/MEM_Stream.i @@ -3,7 +3,7 @@ // MEM_Stream.i -#include "ace/MEM_Stream.h" +#include "ace/Memory/MEM_Stream.h" ASYS_INLINE ACE_MEM_Stream::ACE_MEM_Stream (void) diff --git a/ace/Memory/Malloc.cpp b/ace/Memory/Malloc.cpp index 1033462eb48..34277c41eb5 100644 --- a/ace/Memory/Malloc.cpp +++ b/ace/Memory/Malloc.cpp @@ -3,14 +3,14 @@ #if !defined (ACE_MALLOC_CPP) #define ACE_MALLOC_CPP -#include "ace/Malloc.h" -#include "ace/Object_Manager.h" +#include "ace/Memory/Malloc.h" +#include "ace/Utils/Object_Manager.h" #if !defined (__ACE_INLINE__) -#include "ace/Malloc.i" +#include "ace/Memory/Malloc.i" #endif /* __ACE_INLINE__ */ -#include "ace/Synch_T.h" +#include "ace/Threads/Synch_T.h" ACE_RCSID(ace, Malloc, "$Id$") diff --git a/ace/Memory/Malloc_Allocator.cpp b/ace/Memory/Malloc_Allocator.cpp index 5f98c01746a..b648659dbf0 100644 --- a/ace/Memory/Malloc_Allocator.cpp +++ b/ace/Memory/Malloc_Allocator.cpp @@ -11,14 +11,14 @@ #if !defined (ACE_MALLOC_ALLOCATOR_CPP) #define ACE_MALLOC_ALLOCATOR_CPP -#include "ace/Malloc_Allocator.h" -#include "ace/Object_Manager.h" +#include "ace/Memory/Malloc_Allocator.h" +#include "ace/Utils/Object_Manager.h" #if !defined (__ACE_INLINE__) -#include "ace/Malloc_Allocator.i" +#include "ace/Memory/Malloc_Allocator.i" #endif /* __ACE_INLINE__ */ -#include "ace/Synch_T.h" +#include "ace/Threads/Synch_T.h" ACE_RCSID (ace, Malloc_Allocator, "$Id$") diff --git a/ace/Memory/Malloc_Allocator.h b/ace/Memory/Malloc_Allocator.h index 753c3443b93..d0af1033c81 100644 --- a/ace/Memory/Malloc_Allocator.h +++ b/ace/Memory/Malloc_Allocator.h @@ -23,7 +23,7 @@ #include "ace/Memory/Malloc_Base.h" #ifdef ACE_SUBSET_0 -#include "ace/Log_Msg.h" +#include "ace/Logging/Log_Msg.h" #endif #if defined (ACE_HAS_MALLOC_STATS) diff --git a/ace/Memory/Malloc_Allocator.i b/ace/Memory/Malloc_Allocator.i index b0cfd89b218..49cf04b7d44 100644 --- a/ace/Memory/Malloc_Allocator.i +++ b/ace/Memory/Malloc_Allocator.i @@ -148,6 +148,7 @@ ACE_Static_Allocator_Base::calloc (size_t n_elem, return this->calloc (n_elem * elem_size, initial_value); } +#ifdef ACE_SUBSET_0 ACE_INLINE void ACE_Static_Allocator_Base::free (void *ptr) { @@ -155,6 +156,14 @@ ACE_Static_Allocator_Base::free (void *ptr) ACE_UNUSED_ARG (ptr); ACE_ASSERT (ptr >= this->buffer_ && ptr < this->buffer_ + this->size_); } +#else +ACE_INLINE void +ACE_Static_Allocator_Base::free (void *ptr) +{ + // Check to see if ptr is within our pool?! + ACE_UNUSED_ARG (ptr); +} +#endif ACE_INLINE int ACE_Static_Allocator_Base::remove (void) diff --git a/ace/Memory/Malloc_Instantiations.cpp b/ace/Memory/Malloc_Instantiations.cpp index 72ba9edea67..6dda8274c3c 100644 --- a/ace/Memory/Malloc_Instantiations.cpp +++ b/ace/Memory/Malloc_Instantiations.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ace/Malloc.h" +#include "ace/Memory/Malloc.h" #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/ace/Memory/Mem_Map.cpp b/ace/Memory/Mem_Map.cpp index 4953fcef78d..a07823feaab 100644 --- a/ace/Memory/Mem_Map.cpp +++ b/ace/Memory/Mem_Map.cpp @@ -2,8 +2,11 @@ // Defines the member functions for the memory mapping facility. -#include "ace/Mem_Map.h" -#include "ace/Log_Msg.h" +#include "ace/Memory/Mem_Map.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if defined (ACE_WIN32) \ && (!defined(ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0)) @@ -11,11 +14,11 @@ #endif /* ACE_WIN32 */ #if defined (ACE_USE_MAPPING_NAME) -#include "ace/SString.h" +#include "ace/Utils/SString.h" #endif /* ACE_USE_MAPPING_NAME */ #if !defined (__ACE_INLINE__) -#include "ace/Mem_Map.i" +#include "ace/Memory/Mem_Map.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Mem_Map, "$Id$") @@ -51,6 +54,7 @@ to_mapping_name (ACE_TCHAR *mapobjname, } #endif /* ACE_USE_MAPPING_NAME */ +#ifdef ACE_SUBSET_0 void ACE_Mem_Map::dump (void) const { @@ -65,6 +69,7 @@ ACE_Mem_Map::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nclose_handle_ = %d"), this->close_handle_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } +#endif int ACE_Mem_Map::close (void) @@ -317,6 +322,8 @@ ACE_Mem_Map::ACE_Mem_Map (const ACE_TCHAR *file_name, close_handle_ (0) { ACE_TRACE ("ACE_Mem_Map::ACE_Mem_Map"); + +#ifdef ACE_SUBSET_0 if (this->map (file_name, len, flags, @@ -329,6 +336,17 @@ ACE_Mem_Map::ACE_Mem_Map (const ACE_TCHAR *file_name, ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_Mem_Map::ACE_Mem_Map"))); +#else + this->map (file_name, + len, + flags, + mode, + prot, + share, + addr, + offset, + sa); +#endif } // Map a file from an open file descriptor HANDLE. This function will @@ -352,6 +370,7 @@ ACE_Mem_Map::ACE_Mem_Map (ACE_HANDLE handle, ACE_OS::memset (this->filename_, 0, sizeof this->filename_); +#ifdef ACE_SUBSET_0 if (this->map (handle, len, prot, @@ -362,6 +381,15 @@ ACE_Mem_Map::ACE_Mem_Map (ACE_HANDLE handle, ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_Mem_Map::ACE_Mem_Map"))); +#else + this->map (handle, + len, + prot, + share, + addr, + offset, + sa); +#endif } // Close down and remove the file from the file system. diff --git a/ace/Memory/Memory_Pool.cpp b/ace/Memory/Memory_Pool.cpp index 5a0fe63fabe..79a226982ff 100644 --- a/ace/Memory/Memory_Pool.cpp +++ b/ace/Memory/Memory_Pool.cpp @@ -1,18 +1,21 @@ // $Id$ // Memory_Pool.cpp -#include "ace/Memory_Pool.h" -#include "ace/Log_Msg.h" +#include "ace/Memory/Memory_Pool.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if !defined (__ACE_INLINE__) -#include "ace/Memory_Pool.i" +#include "ace/Memory/Memory_Pool.i" #endif /* __ACE_INLINE__ */ -#include "ace/Auto_Ptr.h" +#include "ace/Utils/Templates/Auto_Ptr.h" #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) -#include "ace/Based_Pointer_T.h" -#include "ace/Based_Pointer_Repository.h" +#include "ace/Memory/Based_Pointer_T.h" +#include "ace/Memory/Based_Pointer_Repository.h" #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ ACE_RCSID(ace, Memory_Pool, "$Id$") diff --git a/ace/Memory/Obchunk.cpp b/ace/Memory/Obchunk.cpp index 5143a07a20c..45c1c84051c 100644 --- a/ace/Memory/Obchunk.cpp +++ b/ace/Memory/Obchunk.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "ace/Obchunk.h" +#include "ace/Memory/Obchunk.h" #if !defined (__ACE_INLINE__) -#include "ace/Obchunk.i" +#include "ace/Memory/Obchunk.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Obchunk, "$Id$") diff --git a/ace/Memory/Obchunk.h b/ace/Memory/Obchunk.h index 9259b97a7a0..8c0afba9d32 100644 --- a/ace/Memory/Obchunk.h +++ b/ace/Memory/Obchunk.h @@ -14,7 +14,7 @@ #define ACE_OBCHUNK_H #include "ace/pre.h" -#include "ace/Malloc.h" +#include "ace/Memory/Malloc.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -65,7 +65,7 @@ public: }; #if defined (__ACE_INLINE__) -#include "ace/Obchunk.i" +#include "ace/Memory/Obchunk.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/Memory/Obstack.cpp b/ace/Memory/Obstack.cpp index d794f1263fe..48fe4a18ad1 100644 --- a/ace/Memory/Obstack.cpp +++ b/ace/Memory/Obstack.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ace/Obstack.h" +#include "ace/Memory/Obstack.h" ACE_RCSID(ace, Obstack, "$Id$") diff --git a/ace/Memory/Obstack.h b/ace/Memory/Obstack.h index a6732bbb290..ff495a5e86e 100644 --- a/ace/Memory/Obstack.h +++ b/ace/Memory/Obstack.h @@ -14,7 +14,7 @@ #define ACE_OBSTACK_H #include "ace/pre.h" -#include "ace/Obstack_T.h" +#include "ace/Memory/Obstack_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Memory/Obstack_T.cpp b/ace/Memory/Obstack_T.cpp index cd80fb23c66..e279988782d 100644 --- a/ace/Memory/Obstack_T.cpp +++ b/ace/Memory/Obstack_T.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "ace/Obstack_T.h" +#include "ace/Memory/Obstack_T.h" #if !defined (__ACE_INLINE__) -#include "ace/Obstack_T.i" +#include "ace/Memory/Obstack_T.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Obstack_T, "$Id$") diff --git a/ace/Memory/Obstack_T.h b/ace/Memory/Obstack_T.h index 0cf272b3dd0..b26b4b51193 100644 --- a/ace/Memory/Obstack_T.h +++ b/ace/Memory/Obstack_T.h @@ -14,7 +14,7 @@ #define ACE_OBSTACK_T_H #include "ace/pre.h" -#include "ace/Obchunk.h" +#include "ace/Memory/Obchunk.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -99,11 +99,11 @@ protected: }; #if defined (__ACE_INLINE__) -#include "ace/Obstack_T.i" +#include "ace/Memory/Obstack_T.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Obstack_T.cpp" +#include "ace/Memory/Obstack_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ace/Memory/PI_Malloc.cpp b/ace/Memory/PI_Malloc.cpp index 8299304f4fb..91e36795b25 100644 --- a/ace/Memory/PI_Malloc.cpp +++ b/ace/Memory/PI_Malloc.cpp @@ -11,15 +11,15 @@ #if !defined (ACE_PI_MALLOC_CPP) #define ACE_PI_MALLOC_CPP -#include "ace/PI_Malloc.h" -#include "ace/Object_Manager.h" -#include "ace/Process_Mutex.h" +#include "ace/Memory/PI_Malloc.h" +#include "ace/Utils/Object_Manager.h" +#include "ace/Threads/Process_Mutex.h" #if !defined (__ACE_INLINE__) -#include "ace/PI_Malloc.i" +#include "ace/Memory/PI_Malloc.i" #endif /* __ACE_INLINE__ */ -#include "ace/Synch_T.h" +#include "ace/Threads/Synch_T.h" ACE_RCSID(ace, PI_Malloc, "$Id$") diff --git a/ace/Memory/PI_Malloc.h b/ace/Memory/PI_Malloc.h index fcb0b0bbb75..58940592f71 100644 --- a/ace/Memory/PI_Malloc.h +++ b/ace/Memory/PI_Malloc.h @@ -14,14 +14,14 @@ #include "ace/pre.h" #include "ace/ACE.h" -#include "Malloc.h" +#include "ace/Memory/Malloc.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) -#include "ace/Based_Pointer_T.h" +#include "ace/Memory/Based_Pointer_T.h" // prepare for position independent malloc /** @@ -202,12 +202,12 @@ private: #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ #if defined (__ACE_INLINE__) -#include "ace/PI_Malloc.i" +#include "ace/Memory/PI_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_PI_MALLOC_H */ diff --git a/ace/Memory/Read_Buffer.cpp b/ace/Memory/Read_Buffer.cpp index 2b88461446e..c8ff8cf7721 100644 --- a/ace/Memory/Read_Buffer.cpp +++ b/ace/Memory/Read_Buffer.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "ace/Read_Buffer.h" -#include "ace/Service_Config.h" +#include "ace/Memory/Read_Buffer.h" +#include "ace/Svcconf/Service_Config.h" #if !defined (__ACE_INLINE__) -#include "ace/Read_Buffer.i" +#include "ace/Memory/Read_Buffer.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Read_Buffer, "$Id$") diff --git a/ace/Memory/Read_Buffer.h b/ace/Memory/Read_Buffer.h index ad1bef9fa32..9cac624c268 100644 --- a/ace/Memory/Read_Buffer.h +++ b/ace/Memory/Read_Buffer.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Malloc.h" +#include "ace/Memory/Malloc.h" /** * @class ACE_Read_Buffer @@ -107,7 +107,7 @@ private: }; #if defined (__ACE_INLINE__) -# include "ace/Read_Buffer.i" +# include "ace/Memory/Read_Buffer.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/Memory/Shared_Memory.cpp b/ace/Memory/Shared_Memory.cpp index 5e4447075ee..ae80be3f52a 100644 --- a/ace/Memory/Shared_Memory.cpp +++ b/ace/Memory/Shared_Memory.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ace/Shared_Memory.h" +#include "ace/Memory/Shared_Memory.h" ACE_RCSID(ace, Shared_Memory, "$Id$") diff --git a/ace/Memory/Shared_Memory_MM.cpp b/ace/Memory/Shared_Memory_MM.cpp index 85778fbdf07..1efb91f1715 100644 --- a/ace/Memory/Shared_Memory_MM.cpp +++ b/ace/Memory/Shared_Memory_MM.cpp @@ -1,10 +1,10 @@ // Shared_Memory_MM.cpp // $Id$ -#include "ace/Shared_Memory_MM.h" +#include "ace/Memory/Shared_Memory_MM.h" #if !defined (__ACE_INLINE__) -#include "ace/Shared_Memory_MM.i" +#include "ace/Memory/Shared_Memory_MM.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Shared_Memory_MM, "$Id$") diff --git a/ace/Memory/Shared_Memory_MM.h b/ace/Memory/Shared_Memory_MM.h index 1ea201be975..391eed7caaf 100644 --- a/ace/Memory/Shared_Memory_MM.h +++ b/ace/Memory/Shared_Memory_MM.h @@ -15,13 +15,13 @@ #define ACE_SHARED_MALLOC_MM_H #include "ace/pre.h" -#include "ace/Shared_Memory.h" +#include "ace/Memory/Shared_Memory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Mem_Map.h" +#include "ace/Memory/Mem_Map.h" /** * @class ACE_Shared_Memory_MM @@ -109,7 +109,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/Shared_Memory_MM.i" +#include "ace/Memory/Shared_Memory_MM.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/Memory/Shared_Memory_SV.cpp b/ace/Memory/Shared_Memory_SV.cpp index bd8dba00a8a..4dd9053d3f0 100644 --- a/ace/Memory/Shared_Memory_SV.cpp +++ b/ace/Memory/Shared_Memory_SV.cpp @@ -1,10 +1,10 @@ // Shared_Memory_SV.cpp // $Id$ -#include "ace/Shared_Memory_SV.h" +#include "ace/Memory/Shared_Memory_SV.h" #if !defined (__ACE_INLINE__) -#include "ace/Shared_Memory_SV.i" +#include "ace/Memory/Shared_Memory_SV.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Shared_Memory_SV, "$Id$") diff --git a/ace/Memory/Shared_Memory_SV.h b/ace/Memory/Shared_Memory_SV.h index 6ed7315c168..5d96c346eb0 100644 --- a/ace/Memory/Shared_Memory_SV.h +++ b/ace/Memory/Shared_Memory_SV.h @@ -15,13 +15,13 @@ #define ACE_SHARED_MALLOC_SV_H #include "ace/pre.h" -#include "ace/Shared_Memory.h" +#include "ace/Memory/Shared_Memory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/SV_Shared_Memory.h" +#include "ace/IPC/SV_Shared_Memory.h" /** * @class ACE_Shared_Memory_SV @@ -90,7 +90,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/Shared_Memory_SV.i" +#include "ace/Memory/Shared_Memory_SV.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/Threads/Process_Semaphore.cpp b/ace/Threads/Process_Semaphore.cpp index ebc036b509b..cf4d112e0f5 100644 --- a/ace/Threads/Process_Semaphore.cpp +++ b/ace/Threads/Process_Semaphore.cpp @@ -1,10 +1,13 @@ // $Id$ -#include "ace/Process_Semaphore.h" -#include "ace/Log_Msg.h" +#include "ace/Threads/Process_Semaphore.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if !defined (__ACE_INLINE__) -#include "ace/Process_Semaphore.inl" +#include "ace/Threads/Process_Semaphore.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Process_Semaphore, "$Id$") diff --git a/ace/Threads/Process_Semaphore.h b/ace/Threads/Process_Semaphore.h index 208bafe8dc1..6f99b39e39e 100644 --- a/ace/Threads/Process_Semaphore.h +++ b/ace/Threads/Process_Semaphore.h @@ -19,14 +19,14 @@ #define ACE_PROCESS_SEMAPHORE_H #include "ace/pre.h" -#include "ace/Synch.h" +#include "ace/Threads/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !(defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM) || defined (ACE_PSOS)) -#include "ace/SV_Semaphore_Complex.h" +#include "ace/IPC/SV_Semaphore_Complex.h" #endif /* !(ACE_WIN32 || ACE_HAS_POSIX_SEM || ACE_PSOS) */ /** @@ -135,7 +135,7 @@ protected: }; #if defined (__ACE_INLINE__) -#include "ace/Process_Semaphore.inl" +#include "ace/Threads/Process_Semaphore.inl" #endif /* __ACE_INLINE__ */ #include "ace/post.h" -- cgit v1.2.1