diff options
| author | storri <storri@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-16 21:49:10 +0000 |
|---|---|---|
| committer | storri <storri@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-16 21:49:10 +0000 |
| commit | 847a16a54890207bc03a77c01e84053fcd964c69 (patch) | |
| tree | 3fe5de8e7ae64020b3495471e1efa604beed76a6 | |
| parent | 29574843d866d4f38a05b840c86ec31e375e7ad7 (diff) | |
| download | ATCD-847a16a54890207bc03a77c01e84053fcd964c69.tar.gz | |
*** empty log message ***
81 files changed, 408 insertions, 204 deletions
diff --git a/ace/IPC/DEV.cpp b/ace/IPC/DEV.cpp index 0aa66003edb..6b6b6eddf36 100644 --- a/ace/IPC/DEV.cpp +++ b/ace/IPC/DEV.cpp @@ -2,10 +2,10 @@ // $Id$ -#include "ace/DEV.h" +#include "ace/IPC/DEV.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/DEV.i" +#include "ace/IPC/DEV.i" #endif ACE_RCSID(ace, DEV, "$Id$") diff --git a/ace/IPC/DEV.h b/ace/IPC/DEV.h index 46213ececdf..a83a4346dda 100644 --- a/ace/IPC/DEV.h +++ b/ace/IPC/DEV.h @@ -15,13 +15,13 @@ #define ACE_DEV_H #include "ace/pre.h" -#include "ace/IO_SAP.h" +#include "ace/IPC/IO_SAP.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/DEV_Addr.h" +#include "ace/IPC/DEV_Addr.h" // The following is necessary since many C++ compilers don't support // typedef'd types inside of classes used as formal template @@ -67,7 +67,7 @@ protected: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/DEV.i" +#include "ace/IPC/DEV.i" #endif #include "ace/post.h" diff --git a/ace/IPC/DEV_Addr.cpp b/ace/IPC/DEV_Addr.cpp index 43dde161857..378be1d268b 100644 --- a/ace/IPC/DEV_Addr.cpp +++ b/ace/IPC/DEV_Addr.cpp @@ -1,11 +1,14 @@ // DEV_Addr.cpp // $Id$ -#include "ace/DEV_Addr.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/DEV_Addr.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if !defined (__ACE_INLINE__) -#include "ace/DEV_Addr.i" +#include "ace/IPC/DEV_Addr.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, DEV_Addr, "$Id$") diff --git a/ace/IPC/DEV_Addr.h b/ace/IPC/DEV_Addr.h index a270004ea31..bbea34b90c0 100644 --- a/ace/IPC/DEV_Addr.h +++ b/ace/IPC/DEV_Addr.h @@ -15,7 +15,7 @@ #define ACE_DEV_ADDR_H #include "ace/pre.h" -#include "ace/Addr.h" +#include "ace/IPC/Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -77,7 +77,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/DEV_Addr.i" +#include "ace/IPC/DEV_Addr.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/IPC/DEV_Addr.i b/ace/IPC/DEV_Addr.i index 53ff88d47bc..8542e753afd 100644 --- a/ace/IPC/DEV_Addr.i +++ b/ace/IPC/DEV_Addr.i @@ -1,7 +1,7 @@ /* -*- C++ -*- */ // $Id$ -#include "ace/SString.h" +#include "ace/Utils/SString.h" ACE_INLINE void ACE_DEV_Addr::set (const ACE_TCHAR *devname) diff --git a/ace/IPC/DEV_IO.cpp b/ace/IPC/DEV_IO.cpp index a6dbee87627..066a689ad47 100644 --- a/ace/IPC/DEV_IO.cpp +++ b/ace/IPC/DEV_IO.cpp @@ -1,11 +1,14 @@ // DEV_IO.cpp // $Id$ -#include "ace/DEV_IO.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/DEV_IO.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/DEV_IO.i" +#include "ace/IPC/DEV_IO.i" #endif ACE_RCSID(ace, DEV_IO, "$Id$") diff --git a/ace/IPC/DEV_IO.h b/ace/IPC/DEV_IO.h index 3e5ed037bbf..46b6fd5a877 100644 --- a/ace/IPC/DEV_IO.h +++ b/ace/IPC/DEV_IO.h @@ -16,13 +16,13 @@ #define ACE_DEV_IO_H #include "ace/pre.h" -#include "ace/DEV.h" +#include "ace/IPC/DEV.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/DEV_Addr.h" +#include "ace/IPC/DEV_Addr.h" /** * @class ACE_DEV_IO @@ -127,7 +127,7 @@ private: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/DEV_IO.i" +#include "ace/IPC/DEV_IO.i" #endif #include "ace/post.h" diff --git a/ace/IPC/FIFO.cpp b/ace/IPC/FIFO.cpp index 99016a7e93d..0709baa0460 100644 --- a/ace/IPC/FIFO.cpp +++ b/ace/IPC/FIFO.cpp @@ -1,17 +1,21 @@ // FIFO.cpp // $Id$ -#include "ace/FIFO.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/FIFO.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if !defined (__ACE_INLINE__) -#include "ace/FIFO.i" +#include "ace/IPC/FIFO.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, FIFO, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_FIFO) +#ifdef ACE_SUBSET_0 void ACE_FIFO::dump (void) const { @@ -21,6 +25,7 @@ ACE_FIFO::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("rendezvous_ = %s"), this->rendezvous_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } +#endif int ACE_FIFO::open (const ACE_TCHAR *r, int flags, int perms, @@ -50,8 +55,13 @@ ACE_FIFO::ACE_FIFO (const ACE_TCHAR *fifo_name, LPSECURITY_ATTRIBUTES sa) { ACE_TRACE ("ACE_FIFO::ACE_FIFO"); + +#ifdef ACE_SUBSET_0 if (this->open (fifo_name, flags, perms, sa) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_FIFO"))); +#else + this->open (fifo_name, flags, perms, sa); +#endif } ACE_FIFO::ACE_FIFO (void) diff --git a/ace/IPC/FIFO.h b/ace/IPC/FIFO.h index bd8ea10d2f2..8f78426748b 100644 --- a/ace/IPC/FIFO.h +++ b/ace/IPC/FIFO.h @@ -15,7 +15,7 @@ #define ACE_FIFO_H #include "ace/pre.h" -#include "ace/IPC_SAP.h" +#include "ace/Sockets/IPC_SAP.h" #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -72,7 +72,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/FIFO.i" +#include "ace/IPC/FIFO.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/IPC/FIFO_Recv.cpp b/ace/IPC/FIFO_Recv.cpp index 7b10a89e017..7d385537883 100644 --- a/ace/IPC/FIFO_Recv.cpp +++ b/ace/IPC/FIFO_Recv.cpp @@ -1,17 +1,21 @@ // FIFO_Recv.cpp // $Id$ -#include "ace/FIFO_Recv.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/FIFO_Recv.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FIFO_Recv.i" +#include "ace/IPC/FIFO_Recv.i" #endif ACE_RCSID(ace, FIFO_Recv, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Recv) +#ifdef ACE_SUBSET_0 void ACE_FIFO_Recv::dump (void) const { @@ -21,6 +25,7 @@ ACE_FIFO_Recv::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("aux_handle_ = %d"), this->aux_handle_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } +#endif int ACE_FIFO_Recv::close (void) @@ -73,10 +78,18 @@ ACE_FIFO_Recv::ACE_FIFO_Recv (const ACE_TCHAR *fifo_name, { ACE_TRACE ("ACE_FIFO_Recv::ACE_FIFO_Recv"); +#ifdef ACE_SUBSET_0 if (this->ACE_FIFO_Recv::open (fifo_name, flags, perms, persistent, sa) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_FIFO_Recv"))); +#else + this->ACE_FIFO_Recv::open (fifo_name, + flags, + perms, + persistent, + sa); +#endif } diff --git a/ace/IPC/FIFO_Recv.h b/ace/IPC/FIFO_Recv.h index 6767cf4ab7b..670534b4c9f 100644 --- a/ace/IPC/FIFO_Recv.h +++ b/ace/IPC/FIFO_Recv.h @@ -15,7 +15,7 @@ #define ACE_FIFO_RECV_H #include "ace/pre.h" -#include "ace/FIFO.h" +#include "ace/IPC/FIFO.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -69,7 +69,7 @@ private: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FIFO_Recv.i" +#include "ace/IPC/FIFO_Recv.i" #endif #include "ace/post.h" diff --git a/ace/IPC/FIFO_Recv_Msg.cpp b/ace/IPC/FIFO_Recv_Msg.cpp index 714cc43986f..14de067f12c 100644 --- a/ace/IPC/FIFO_Recv_Msg.cpp +++ b/ace/IPC/FIFO_Recv_Msg.cpp @@ -1,11 +1,14 @@ // FIFO_Recv_Msg.cpp // $Id$ -#include "ace/FIFO_Recv_Msg.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/FIFO_Recv_Msg.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FIFO_Recv_Msg.i" +#include "ace/IPC/FIFO_Recv_Msg.i" #endif ACE_RCSID(ace, FIFO_Recv_Msg, "$Id$") @@ -52,10 +55,18 @@ ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (const ACE_TCHAR *fifo_name, { ACE_TRACE ("ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg"); +#ifdef ACE_SUBSET_0 if (this->ACE_FIFO_Recv_Msg::open (fifo_name, flags, perms, persistent, sa) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_FIFO_Recv_Msg"))); +#else + this->ACE_FIFO_Recv_Msg::open (fifo_name, + flags, + perms, + persistent, + sa); +#endif } diff --git a/ace/IPC/FIFO_Recv_Msg.h b/ace/IPC/FIFO_Recv_Msg.h index 3920e063630..d90bccf8c28 100644 --- a/ace/IPC/FIFO_Recv_Msg.h +++ b/ace/IPC/FIFO_Recv_Msg.h @@ -15,7 +15,7 @@ #define ACE_FIFO_RECV_MSG_H #include "ace/pre.h" -#include "ace/FIFO_Recv.h" +#include "ace/IPC/FIFO_Recv.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -74,7 +74,7 @@ public: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FIFO_Recv_Msg.i" +#include "ace/IPC/FIFO_Recv_Msg.i" #endif #include "ace/post.h" diff --git a/ace/IPC/FIFO_Send.cpp b/ace/IPC/FIFO_Send.cpp index a51a16f5f96..fc48002d14a 100644 --- a/ace/IPC/FIFO_Send.cpp +++ b/ace/IPC/FIFO_Send.cpp @@ -1,11 +1,14 @@ // FIFO_Send.cpp // $Id$ -#include "ace/FIFO_Send.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/FIFO_Send.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FIFO_Send.i" +#include "ace/IPC/FIFO_Send.i" #endif ACE_RCSID(ace, FIFO_Send, "$Id$") @@ -43,6 +46,8 @@ ACE_FIFO_Send::ACE_FIFO_Send (const ACE_TCHAR *fifo_name, LPSECURITY_ATTRIBUTES sa) { ACE_TRACE ("ACE_FIFO_Send::ACE_FIFO_Send"); + +#ifdef ACE_SUBSET_0 if (this->ACE_FIFO_Send::open (fifo_name, flags, perms, @@ -50,4 +55,10 @@ ACE_FIFO_Send::ACE_FIFO_Send (const ACE_TCHAR *fifo_name, ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_FIFO_Send::ACE_FIFO_Send"))); +#else + this->ACE_FIFO_Send::open (fifo_name, + flags, + perms, + sa); +#endif } diff --git a/ace/IPC/FIFO_Send.h b/ace/IPC/FIFO_Send.h index 7c870454b82..20a26b89a22 100644 --- a/ace/IPC/FIFO_Send.h +++ b/ace/IPC/FIFO_Send.h @@ -15,7 +15,7 @@ #define ACE_FIFO_SEND_H #include "ace/pre.h" -#include "ace/FIFO.h" +#include "ace/IPC/FIFO.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -59,7 +59,7 @@ public: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FIFO_Send.i" +#include "ace/IPC/FIFO_Send.i" #endif #include "ace/post.h" diff --git a/ace/IPC/FIFO_Send_Msg.cpp b/ace/IPC/FIFO_Send_Msg.cpp index 8d947252002..4b1c2e3703b 100644 --- a/ace/IPC/FIFO_Send_Msg.cpp +++ b/ace/IPC/FIFO_Send_Msg.cpp @@ -1,8 +1,11 @@ // FIFO_Send_Msg.cpp // $Id$ -#include "ace/FIFO_Send_Msg.h" +#include "ace/IPC/FIFO_Send_Msg.h" + +#ifdef ACE_SUBSET_0 #include "ace/Log_Msg.h" +#endif #if defined (ACE_LACKS_INLINE_FUNCTIONS) #include "ace/FIFO_Send_Msg.i" @@ -65,6 +68,11 @@ ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg (const ACE_TCHAR *fifo_name, LPSECURITY_ATTRIBUTES sa) { ACE_TRACE ("ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg"); + +#ifdef ACE_SUBSET_0 if (this->ACE_FIFO_Send_Msg::open (fifo_name, flags, perms, sa) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_FIFO_Send_Msg"))); +#else + this->ACE_FIFO_Send_Msg::open (fifo_name, flags, perms, sa); +#endif } diff --git a/ace/IPC/FIFO_Send_Msg.h b/ace/IPC/FIFO_Send_Msg.h index cc4ae785e41..684a30918ce 100644 --- a/ace/IPC/FIFO_Send_Msg.h +++ b/ace/IPC/FIFO_Send_Msg.h @@ -15,7 +15,7 @@ #define ACE_FIFO_SEND_MSG_H #include "ace/pre.h" -#include "ace/FIFO_Send.h" +#include "ace/IPC/FIFO_Send.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -73,7 +73,7 @@ public: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FIFO_Send_Msg.i" +#include "ace/IPC/FIFO_Send_Msg.i" #endif #include "ace/post.h" diff --git a/ace/IPC/FILE.cpp b/ace/IPC/FILE.cpp index 1c031eaa049..188e8c3db51 100644 --- a/ace/IPC/FILE.cpp +++ b/ace/IPC/FILE.cpp @@ -4,10 +4,10 @@ /* Defines the member functions for the base class of the ACE_IO_SAP ACE_FILE abstraction. */ -#include "ace/FILE.h" +#include "ace/IPC/FILE.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FILE.i" +#include "ace/IPC/FILE.i" #endif ACE_RCSID(ace, FILE, "$Id$") diff --git a/ace/IPC/FILE.h b/ace/IPC/FILE.h index e9fbfc1d749..f61c13569ea 100644 --- a/ace/IPC/FILE.h +++ b/ace/IPC/FILE.h @@ -14,13 +14,13 @@ #define ACE_FILE_H #include "ace/pre.h" -#include "ace/IO_SAP.h" +#include "ace/IPC/IO_SAP.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/FILE_Addr.h" +#include "ace/IPC/FILE_Addr.h" // The following is necessary since many C++ compilers don't support // typedef'd types inside of classes used as formal template @@ -133,7 +133,7 @@ protected: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FILE.i" +#include "ace/IPC/FILE.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ #include "ace/post.h" diff --git a/ace/IPC/FILE_Addr.cpp b/ace/IPC/FILE_Addr.cpp index cc7c47743ec..e0b001e0890 100644 --- a/ace/IPC/FILE_Addr.cpp +++ b/ace/IPC/FILE_Addr.cpp @@ -1,10 +1,13 @@ // $Id$ -#include "ace/FILE_Addr.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/FILE_Addr.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if !defined (__ACE_INLINE__) -#include "ace/FILE_Addr.i" +#include "ace/IPC/FILE_Addr.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, FILE_Addr, "$Id$") diff --git a/ace/IPC/FILE_Addr.h b/ace/IPC/FILE_Addr.h index b0307e6f856..6c5cd5df719 100644 --- a/ace/IPC/FILE_Addr.h +++ b/ace/IPC/FILE_Addr.h @@ -15,13 +15,13 @@ #define ACE_FILE_ADDR_H #include "ace/pre.h" -#include "ace/Addr.h" +#include "ace/IPC/Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Flag_Manip.h" +#include "ace/Utils/Flag_Manip.h" /** * @class ACE_FILE_Addr @@ -78,7 +78,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/FILE_Addr.i" +#include "ace/IPC/FILE_Addr.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/IPC/FILE_Addr.i b/ace/IPC/FILE_Addr.i index 6acce0515b8..9bb35c20a59 100644 --- a/ace/IPC/FILE_Addr.i +++ b/ace/IPC/FILE_Addr.i @@ -7,7 +7,7 @@ // Transform the current address into string format. -#include "ace/SString.h" +#include "ace/Utils/SString.h" // Return the address. diff --git a/ace/IPC/FILE_Connector.cpp b/ace/IPC/FILE_Connector.cpp index d858fc68c5f..7933046ea78 100644 --- a/ace/IPC/FILE_Connector.cpp +++ b/ace/IPC/FILE_Connector.cpp @@ -1,11 +1,11 @@ // FILE_Connector.cpp // $Id$ -#include "ace/FILE_Connector.h" -#include "ace/Handle_Ops.h" +#include "ace/IPC/FILE_Connector.h" +#include "ace/OS/Handle_Ops.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FILE_Connector.i" +#include "ace/IPC/FILE_Connector.i" #endif ACE_RCSID(ace, FILE_Connector, "$Id$") diff --git a/ace/IPC/FILE_Connector.h b/ace/IPC/FILE_Connector.h index 859872b45d1..11f9bfb36d5 100644 --- a/ace/IPC/FILE_Connector.h +++ b/ace/IPC/FILE_Connector.h @@ -14,8 +14,11 @@ #define ACE_FILE_CONNECTOR_H #include "ace/pre.h" -#include "ace/FILE_IO.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/FILE_IO.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -103,7 +106,7 @@ public: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FILE_Connector.i" +#include "ace/IPC/FILE_Connector.i" #endif #include "ace/post.h" diff --git a/ace/IPC/FILE_IO.cpp b/ace/IPC/FILE_IO.cpp index de7400f3c82..8ffd559521f 100644 --- a/ace/IPC/FILE_IO.cpp +++ b/ace/IPC/FILE_IO.cpp @@ -1,17 +1,21 @@ // FILE_IO.cpp // $Id$ -#include "ace/FILE_IO.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/FILE_IO.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FILE_IO.i" +#include "ace/IPC/FILE_IO.i" #endif ACE_RCSID(ace, FILE_IO, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_FILE_IO) +#ifdef ACE_SUBSET_0 void ACE_FILE_IO::dump (void) const { @@ -21,6 +25,7 @@ ACE_FILE_IO::dump (void) const this->addr_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } +#endif // Simple-minded do nothing constructor. diff --git a/ace/IPC/FILE_IO.h b/ace/IPC/FILE_IO.h index b4060da77aa..90236e32a5b 100644 --- a/ace/IPC/FILE_IO.h +++ b/ace/IPC/FILE_IO.h @@ -14,13 +14,13 @@ #define ACE_FILE_IO_H #include "ace/pre.h" -#include "ace/FILE.h" +#include "ace/IPC/FILE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/FILE_Addr.h" +#include "ace/IPC/FILE_Addr.h" // Used in the FILE_IO.h file... #include "ace/ACE.h" @@ -153,7 +153,7 @@ public: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FILE_IO.i" +#include "ace/IPC/FILE_IO.i" #endif /* !defined (ACE_LACKS_INLINE_FUNCTIONS) */ #include "ace/post.h" diff --git a/ace/IPC/INET_Addr.cpp b/ace/IPC/INET_Addr.cpp index c822baf0a2b..893d3fcf920 100644 --- a/ace/IPC/INET_Addr.cpp +++ b/ace/IPC/INET_Addr.cpp @@ -384,6 +384,8 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number, { ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_)); + +#ifdef ACE_SUBSET_0 if (this->set (port_number, host_name, 1, @@ -400,6 +402,12 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number, ACE_TEXT_CHAR_TO_TCHAR ((host_name == 0) ? "<unknown>" : host_name))); #endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ +#else /* ACE_SUBSET_0 */ + this->set (port_number, + host_name, + 1, + address_family); +#endif /* ACE_SUBSET_0 */ } #if defined (ACE_HAS_WCHAR) @@ -501,10 +509,15 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number, { ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_)); + +#ifdef ACE_SUBSET_0 if (this->set (port_number, inet_address) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); +#else + this->set (port_number, inet_address); +#endif } // Creates a ACE_INET_Addr from a PORT_NAME and the remote @@ -517,11 +530,18 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[], { ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_)); + +#ifdef ACE_SUBSET_0 if (this->set (port_name, host_name, protocol) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); +#else + this->set (port_name, + host_name, + protocol); +#endif } #if defined (ACE_HAS_WCHAR) @@ -532,11 +552,18 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[], { ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_)); + +#ifdef ACE_SUBSET_0 if (this->set (port_name, host_name, protocol) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); +#else + this->set (port_name, + host_name, + protocol); +#endif } #endif /* ACE_HAS_WCHAR */ @@ -550,11 +577,18 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[], { ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_)); + +#ifdef ACE_SUBSET_0 if (this->set (port_name, inet_address, protocol) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); +#else + this->set (port_name, + inet_address, + protocol); +#endif } #if defined (ACE_HAS_WCHAR) @@ -565,11 +599,18 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[], { ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_)); + +#ifdef ACE_SUBSET_0 if (this->set (port_name, inet_address, protocol) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); +#else + this->set (port_name, + inet_address, + protocol); +#endif } #endif /* ACE_HAS_WCHAR */ diff --git a/ace/IPC/IOStream.cpp b/ace/IPC/IOStream.cpp index c024f85537f..b1d1806877f 100644 --- a/ace/IPC/IOStream.cpp +++ b/ace/IPC/IOStream.cpp @@ -3,7 +3,7 @@ #if !defined (ACE_IOSTREAM_C) #define ACE_IOSTREAM_C -#include "ace/IOStream.h" +#include "ace/IPC/IOStream.h" ACE_RCSID(ace, IOStream, "$Id$") diff --git a/ace/IPC/IOStream.h b/ace/IPC/IOStream.h index 89ce9fb31d5..3fad35a709a 100644 --- a/ace/IPC/IOStream.h +++ b/ace/IPC/IOStream.h @@ -16,7 +16,7 @@ #define ACE_IOSTREAM_H #include "ace/pre.h" -#include "ace/OS.h" +#include "ace/OS/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -506,7 +506,7 @@ typedef ostream& (*__omanip_)(ostream&); #define GETPUT_SIG_SET(MT) GET_SIG_SET(MT) PUT_SIG_SET(MT) // Include the templates here. -#include "ace/IOStream_T.h" +#include "ace/IPC/IOStream_T.h" #endif /* !ACE_LACKS_ACE_IOSTREAM && ACE_USES_OLD_IOSTREAMS */ #include "ace/post.h" diff --git a/ace/IPC/IOStream_T.cpp b/ace/IPC/IOStream_T.cpp index 176f47afc17..b2f7dde16e5 100644 --- a/ace/IPC/IOStream_T.cpp +++ b/ace/IPC/IOStream_T.cpp @@ -3,7 +3,7 @@ #ifndef ACE_IOSTREAM_T_C #define ACE_IOSTREAM_T_C -#include "ace/IOStream_T.h" +#include "ace/IPC/IOStream_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,7 +28,7 @@ ACE_RCSID(ace, IOStream_T, "$Id$") #endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION && __GNUG__ */ #if !defined (__ACE_INLINE__) -#include "ace/IOStream_T.i" +#include "ace/IPC/IOStream_T.i" #endif /* !__ACE_INLINE__ */ // We will be given a STREAM by the iostream object which creates us. diff --git a/ace/IPC/IOStream_T.h b/ace/IPC/IOStream_T.h index b853cd0f1f8..f6f0bc688a1 100644 --- a/ace/IPC/IOStream_T.h +++ b/ace/IPC/IOStream_T.h @@ -20,7 +20,7 @@ #define ACE_IOSTREAM_T_H #include "ace/pre.h" -#include "ace/IOStream.h" +#include "ace/IPC/IOStream.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,8 +28,8 @@ #if !defined (ACE_LACKS_ACE_IOSTREAM) -#include "ace/INET_Addr.h" -#include "ace/Handle_Set.h" +#include "ace/IPC/INET_Addr.h" +#include "ace/OS/Handle_Set.h" #if defined (ACE_HAS_STRING_CLASS) template <class STREAM> STREAM & operator>> (STREAM &stream, ACE_Quoted_String &str); @@ -274,11 +274,11 @@ protected: }; #if defined (__ACE_INLINE__) -#include "ace/IOStream_T.i" +#include "ace/IPC/IOStream_T.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/IOStream_T.cpp" +#include "ace/IPC/IOStream_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/ace/IPC/IO_SAP.cpp b/ace/IPC/IO_SAP.cpp index f3ad46c46b7..dcb198e97e1 100644 --- a/ace/IPC/IO_SAP.cpp +++ b/ace/IPC/IO_SAP.cpp @@ -1,11 +1,15 @@ // IO_SAP.cpp // $Id$ -#include "ace/IO_SAP.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/IO_SAP.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif + #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/IO_SAP.i" +#include "ace/IPC/IO_SAP.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ ACE_RCSID(ace, IO_SAP, "$Id$") @@ -21,6 +25,7 @@ ACE_IO_SAP::ACE_IO_SAP (void) ACE_TRACE ("ACE_IO_SAP::ACE_IO_SAP"); } +#ifdef ACE_SUBSET_0 void ACE_IO_SAP::dump (void) const { @@ -31,6 +36,7 @@ ACE_IO_SAP::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npid_ = %d"), this->pid_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } +#endif // Cache for the process ID. pid_t ACE_IO_SAP::pid_ = 0; diff --git a/ace/IPC/IO_SAP.h b/ace/IPC/IO_SAP.h index 4cc1d5cda84..bfcd1ebbd74 100644 --- a/ace/IPC/IO_SAP.h +++ b/ace/IPC/IO_SAP.h @@ -15,7 +15,7 @@ #define ACE_IO_SAP_H #include "ace/pre.h" -#include "ace/Flag_Manip.h" +#include "ace/Utils/Flag_Manip.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -83,7 +83,7 @@ private: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/IO_SAP.i" +#include "ace/IPC/IO_SAP.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ #include "ace/post.h" diff --git a/ace/IPC/Pipe.cpp b/ace/IPC/Pipe.cpp index 85f84575717..1929b8e4d06 100644 --- a/ace/IPC/Pipe.cpp +++ b/ace/IPC/Pipe.cpp @@ -1,9 +1,12 @@ // $Id$ -#include "ace/Pipe.h" -#include "ace/SOCK_Acceptor.h" -#include "ace/SOCK_Connector.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/Pipe.h" +#include "ace/Sockets/SOCK_Acceptor.h" +#include "ace/Sockets/SOCK_Connector.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if defined (ACE_LACKS_INLINE_FUNCTIONS) #include "ace/Pipe.i" @@ -11,6 +14,7 @@ ACE_RCSID(ace, Pipe, "$Id$") +#ifdef ACE_SUBSET_0 void ACE_Pipe::dump (void) const { @@ -21,7 +25,7 @@ ACE_Pipe::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } - +#endif int ACE_Pipe::open (int buffer_size) { @@ -130,6 +134,8 @@ ACE_Pipe::open (int buffer_size) #endif /* __QNX__ */ #else /* ! ACE_WIN32 && ! ACE_LACKS_SOCKETPAIR && ! ACE_HAS_STREAM_PIPES */ + +#ifdef ACE_SUBSET_0 if (ACE_OS::socketpair (AF_UNIX, SOCK_STREAM, 0, @@ -138,6 +144,13 @@ ACE_Pipe::open (int buffer_size) ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("socketpair")), -1); +#else + ACE_OS::socketpair (AF_UNIX, + SOCK_STREAM, + 0, + this->handles_); +#endif /* ACE_SUBSET_0 */ + # if defined (ACE_LACKS_SOCKET_BUFSIZ) ACE_UNUSED_ARG (buffer_size); # else /* ! ACE_LACKS_SOCKET_BUFSIZ */ @@ -199,9 +212,14 @@ ACE_Pipe::ACE_Pipe (ACE_HANDLE handles[2]) { ACE_TRACE ("ACE_Pipe::ACE_Pipe"); + +#ifdef ACE_SUBSET_0 if (this->open (handles) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_Pipe::ACE_Pipe"))); +#else + this->open (handles); +#endif } ACE_Pipe::ACE_Pipe (ACE_HANDLE read, diff --git a/ace/IPC/SPIPE.cpp b/ace/IPC/SPIPE.cpp index 0f2be4cc65d..60733674f25 100644 --- a/ace/IPC/SPIPE.cpp +++ b/ace/IPC/SPIPE.cpp @@ -1,10 +1,10 @@ // SPIPE.cpp // $Id$ -#include "ace/SPIPE.h" +#include "ace/IPC/SPIPE.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SPIPE.i" +#include "ace/IPC/SPIPE.i" #endif ACE_RCSID(ace, SPIPE, "$Id$") diff --git a/ace/IPC/SPIPE.h b/ace/IPC/SPIPE.h index 04e06d71011..9a13861b4ee 100644 --- a/ace/IPC/SPIPE.h +++ b/ace/IPC/SPIPE.h @@ -15,13 +15,13 @@ #define ACE_SPIPE_H #include "ace/pre.h" -#include "ace/IPC_SAP.h" +#include "ace/Sockets/IPC_SAP.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/SPIPE_Addr.h" +#include "ace/IPC/SPIPE_Addr.h" /** * @class ACE_SPIPE @@ -93,7 +93,7 @@ protected: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SPIPE.i" +#include "ace/IPC/SPIPE.i" #endif #include "ace/post.h" diff --git a/ace/IPC/SPIPE_Acceptor.cpp b/ace/IPC/SPIPE_Acceptor.cpp index ace2ceabbc5..c2b3efaf16b 100644 --- a/ace/IPC/SPIPE_Acceptor.cpp +++ b/ace/IPC/SPIPE_Acceptor.cpp @@ -1,8 +1,11 @@ // SPIPE_Acceptor.cpp // $Id$ -#include "ace/SPIPE_Acceptor.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/SPIPE_Acceptor.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif ACE_RCSID(ace, SPIPE_Acceptor, "$Id$") diff --git a/ace/IPC/SPIPE_Acceptor.h b/ace/IPC/SPIPE_Acceptor.h index cb2b536f736..a7ec589faa4 100644 --- a/ace/IPC/SPIPE_Acceptor.h +++ b/ace/IPC/SPIPE_Acceptor.h @@ -15,14 +15,14 @@ #define ACE_SPIPE_ACCEPTOR_H #include "ace/pre.h" -#include "ace/SPIPE_Stream.h" +#include "ace/IPC/SPIPE_Stream.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_WIN32) -#include "ace/Synch.h" +#include "ace/Threads/Synch.h" #endif /* ACE_WIN32 */ /** diff --git a/ace/IPC/SPIPE_Addr.cpp b/ace/IPC/SPIPE_Addr.cpp index 1d388f670ce..abe29ca9794 100644 --- a/ace/IPC/SPIPE_Addr.cpp +++ b/ace/IPC/SPIPE_Addr.cpp @@ -1,10 +1,10 @@ // SPIPE_Addr.cpp // $Id$ -#include "ace/SPIPE_Addr.h" +#include "ace/IPC/SPIPE_Addr.h" #if !defined (__ACE_INLINE__) -#include "ace/SPIPE_Addr.i" +#include "ace/IPC/SPIPE_Addr.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, SPIPE_Addr, "$Id$") diff --git a/ace/IPC/SPIPE_Addr.h b/ace/IPC/SPIPE_Addr.h index c4878d5d374..828b5e00716 100644 --- a/ace/IPC/SPIPE_Addr.h +++ b/ace/IPC/SPIPE_Addr.h @@ -15,7 +15,7 @@ #define ACE_SPIPE_ADDR_H #include "ace/pre.h" -#include "ace/Addr.h" +#include "ace/IPC/Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -106,7 +106,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/SPIPE_Addr.i" +#include "ace/IPC/SPIPE_Addr.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/IPC/SPIPE_Addr.i b/ace/IPC/SPIPE_Addr.i index e6af565b53b..4249b9020e6 100644 --- a/ace/IPC/SPIPE_Addr.i +++ b/ace/IPC/SPIPE_Addr.i @@ -3,7 +3,7 @@ // SPIPE_Addr.i -#include "ace/SString.h" +#include "ace/Utils/SString.h" // Transform the current address into string format. diff --git a/ace/IPC/SPIPE_Connector.cpp b/ace/IPC/SPIPE_Connector.cpp index a9006ef9f5a..2968584bb9b 100644 --- a/ace/IPC/SPIPE_Connector.cpp +++ b/ace/IPC/SPIPE_Connector.cpp @@ -1,11 +1,14 @@ // SPIPE_Connector.cpp // $Id$ -#include "ace/SPIPE_Connector.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/SPIPE_Connector.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SPIPE_Connector.i" +#include "ace/IPC/SPIPE_Connector.i" #endif ACE_RCSID(ace, SPIPE_Connector, "$Id$") diff --git a/ace/IPC/SPIPE_Connector.h b/ace/IPC/SPIPE_Connector.h index 6e400c32c40..3355e55ca51 100644 --- a/ace/IPC/SPIPE_Connector.h +++ b/ace/IPC/SPIPE_Connector.h @@ -14,7 +14,7 @@ #define ACE_SPIPE_CONNECTOR_H #include "ace/pre.h" -#include "ace/SPIPE_Stream.h" +#include "ace/IPC/SPIPE_Stream.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -98,7 +98,7 @@ public: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SPIPE_Connector.i" +#include "ace/IPC/SPIPE_Connector.i" #endif #include "ace/post.h" diff --git a/ace/IPC/SPIPE_Stream.cpp b/ace/IPC/SPIPE_Stream.cpp index 9488d8dcdc0..ee68468ea0b 100644 --- a/ace/IPC/SPIPE_Stream.cpp +++ b/ace/IPC/SPIPE_Stream.cpp @@ -1,10 +1,10 @@ // SPIPE_Stream.cpp // $Id$ -#include "ace/SPIPE_Stream.h" +#include "ace/IPC/SPIPE_Stream.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SPIPE_Stream.i" +#include "ace/IPC/SPIPE_Stream.i" #endif ACE_RCSID(ace, SPIPE_Stream, "$Id$") diff --git a/ace/IPC/SPIPE_Stream.h b/ace/IPC/SPIPE_Stream.h index 1bbed754227..2cdc137599e 100644 --- a/ace/IPC/SPIPE_Stream.h +++ b/ace/IPC/SPIPE_Stream.h @@ -15,13 +15,13 @@ #define ACE_SPIPE_STREAM_H #include "ace/pre.h" -#include "ace/SPIPE.h" +#include "ace/IPC/SPIPE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/SPIPE_Addr.h" +#include "ace/IPC/SPIPE_Addr.h" /** * @class ACE_SPIPE_Stream @@ -140,7 +140,7 @@ private: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SPIPE_Stream.i" +#include "ace/IPC/SPIPE_Stream.i" #endif #include "ace/post.h" diff --git a/ace/IPC/SV_Message.cpp b/ace/IPC/SV_Message.cpp index fef83458651..d5b9112401f 100644 --- a/ace/IPC/SV_Message.cpp +++ b/ace/IPC/SV_Message.cpp @@ -1,10 +1,10 @@ // SV_Message.cpp // $Id$ -#include "ace/SV_Message.h" +#include "ace/IPC/SV_Message.h" #if !defined (__ACE_INLINE__) -#include "ace/SV_Message.i" +#include "ace/IPC/SV_Message.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, SV_Message, "$Id$") diff --git a/ace/IPC/SV_Message.h b/ace/IPC/SV_Message.h index b93d9e531e5..28aabeb33c8 100644 --- a/ace/IPC/SV_Message.h +++ b/ace/IPC/SV_Message.h @@ -49,7 +49,7 @@ protected: }; #if defined (__ACE_INLINE__) -#include "ace/SV_Message.i" +#include "ace/IPC/SV_Message.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/IPC/SV_Message_Queue.cpp b/ace/IPC/SV_Message_Queue.cpp index d9f924e82eb..cf921e4d787 100644 --- a/ace/IPC/SV_Message_Queue.cpp +++ b/ace/IPC/SV_Message_Queue.cpp @@ -1,11 +1,14 @@ // SV_Message_Queue.cpp // $Id$ -#include "ace/SV_Message_Queue.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/SV_Message_Queue.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SV_Message_Queue.i" +#include "ace/IPC/SV_Message_Queue.i" #endif ACE_RCSID(ace, SV_Message_Queue, "$Id$") @@ -33,7 +36,11 @@ ACE_SV_Message_Queue::ACE_SV_Message_Queue (key_t external_id, int perms) { ACE_TRACE ("ACE_SV_Message_Queue::ACE_SV_Message_Queue"); +#ifdef ACE_SUBSET_0 if (this->open (external_id, create, perms) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SV_Message_Queue::ACE_SV_Message_Queue"))); +#else + this->open (external_id, create, perms); +#endif } diff --git a/ace/IPC/SV_Message_Queue.h b/ace/IPC/SV_Message_Queue.h index 20af5ad8cfa..752280d01a9 100644 --- a/ace/IPC/SV_Message_Queue.h +++ b/ace/IPC/SV_Message_Queue.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/SV_Message.h" +#include "ace/IPC/SV_Message.h" /** * @class ACE_SV_Message_Queue @@ -88,7 +88,7 @@ protected: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SV_Message_Queue.i" +#include "ace/IPC/SV_Message_Queue.i" #endif #include "ace/post.h" diff --git a/ace/IPC/SV_Message_Queue.i b/ace/IPC/SV_Message_Queue.i index 65c092136f7..6b558bfea9d 100644 --- a/ace/IPC/SV_Message_Queue.i +++ b/ace/IPC/SV_Message_Queue.i @@ -3,7 +3,7 @@ // SV_Message_Queue.i -#include "ace/SV_Message_Queue.h" +#include "ace/IPC/SV_Message_Queue.h" // Open a message queue using the <external_id>. diff --git a/ace/IPC/SV_Semaphore_Complex.cpp b/ace/IPC/SV_Semaphore_Complex.cpp index 4c751da24cb..b5044f746a2 100644 --- a/ace/IPC/SV_Semaphore_Complex.cpp +++ b/ace/IPC/SV_Semaphore_Complex.cpp @@ -1,11 +1,14 @@ // SV_Semaphore_Complex.cpp // $Id$ -#include "ace/SV_Semaphore_Complex.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/SV_Semaphore_Complex.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SV_Semaphore_Complex.i" +#include "ace/IPCIPC//SV_Semaphore_Complex.i" #endif ACE_RCSID(ace, SV_Semaphore_Complex, "$Id$") @@ -215,8 +218,12 @@ ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (key_t k, int perms) { ACE_TRACE ("ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex"); +#ifdef ACE_SUBSET_0 if (this->open (k, flags, initial_value, nsems, perms) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SV_Semaphore_Complex"))); +#else + this->open (k, flags, initial_value, nsems, perms); +#endif } ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (const char *name, @@ -234,8 +241,12 @@ ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (const char *name, else key = this->name_2_key (name); +#ifdef ACE_SUBSET_0 if (this->open (key, flags, initial_value, nsems, perms) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SV_Semaphore_Complex"))); +#else + this->open (key, flags, initial_value, nsems, perms); +#endif } ACE_SV_Semaphore_Complex::~ACE_SV_Semaphore_Complex (void) diff --git a/ace/IPC/SV_Semaphore_Simple.cpp b/ace/IPC/SV_Semaphore_Simple.cpp index ebb93233fc1..aec01bb70d0 100644 --- a/ace/IPC/SV_Semaphore_Simple.cpp +++ b/ace/IPC/SV_Semaphore_Simple.cpp @@ -1,10 +1,13 @@ // $Id$ -#include "ace/SV_Semaphore_Simple.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/SV_Semaphore_Simple.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SV_Semaphore_Simple.i" +#include "ace/IPC/SV_Semaphore_Simple.i" #endif ACE_RCSID(ace, SV_Semaphore_Simple, "$Id$") @@ -107,8 +110,12 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (key_t k, : key_ (k) { ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"); +#ifdef ACE_SUBSET_0 if (this->open (k, flags, initial_value, n, perms) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SV_Semaphore::ACE_SV_Semaphore"))); +#else + this->open (k, flags, initial_value, n, perms); +#endif } // Convert name to key. This function is used internally to create keys @@ -164,6 +171,7 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const char *name, int perms) { ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"); +#ifdef ACE_SUBSET_0 if (this->open (name, flags, initial_value, @@ -172,6 +180,13 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const char *name, ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"))); +#else + this->open (name, + flags, + initial_value, + n, + perms); +#endif } ACE_SV_Semaphore_Simple::~ACE_SV_Semaphore_Simple (void) diff --git a/ace/IPC/SV_Shared_Memory.cpp b/ace/IPC/SV_Shared_Memory.cpp index dfa73d99c67..cb51b2f1baf 100644 --- a/ace/IPC/SV_Shared_Memory.cpp +++ b/ace/IPC/SV_Shared_Memory.cpp @@ -1,11 +1,14 @@ // SV_Shared_Memory.cpp // $Id$ -#include "ace/SV_Shared_Memory.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/SV_Shared_Memory.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if !defined (__ACE_INLINE__) -#include "ace/SV_Shared_Memory.i" +#include "ace/IPC/SV_Shared_Memory.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, SV_Shared_Memory, "$Id$") @@ -48,10 +51,16 @@ ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (key_t external_id, int flags) { ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"); + +#ifdef ACE_SUBSET_0 if (this->open_and_attach (external_id, sz, create, perms, virtual_addr, flags) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"))); +#else + this->open_and_attach (external_id, sz, create, + perms, virtual_addr, flags); +#endif } // The "do nothing" constructor. @@ -77,7 +86,11 @@ ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (ACE_HANDLE int_id, size_ (0) { ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"); +#ifdef ACE_SUBSET_0 if (this->attach (0, flags) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"))); +#else + this->attach (0, flags); +#endif } diff --git a/ace/IPC/SV_Shared_Memory.h b/ace/IPC/SV_Shared_Memory.h index 977d33f6faa..a5b0f304a16 100644 --- a/ace/IPC/SV_Shared_Memory.h +++ b/ace/IPC/SV_Shared_Memory.h @@ -105,7 +105,7 @@ protected: }; #if defined (__ACE_INLINE__) -#include "ace/SV_Shared_Memory.i" +#include "ace/IPC/SV_Shared_Memory.i" #endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/ace/IPC/SV_Shared_Memory.i b/ace/IPC/SV_Shared_Memory.i index 9fd4083ff95..1d42a2f8201 100644 --- a/ace/IPC/SV_Shared_Memory.i +++ b/ace/IPC/SV_Shared_Memory.i @@ -3,7 +3,7 @@ // SV_Shared_Memory.i -#include "ace/SV_Shared_Memory.h" +#include "ace/IPC/SV_Shared_Memory.h" ACE_INLINE int ACE_SV_Shared_Memory::round_up (size_t len) diff --git a/ace/IPC/Signal.cpp b/ace/IPC/Signal.cpp index 3bd3d01cedb..b61c8784d55 100644 --- a/ace/IPC/Signal.cpp +++ b/ace/IPC/Signal.cpp @@ -1,13 +1,17 @@ // $Id$ -#include "ace/Synch_T.h" -#include "ace/Signal.h" -#include "ace/Object_Manager.h" -#include "ace/Log_Msg.h" -#include "ace/Containers.h" +#include "ace/Threads/Synch_T.h" +#include "ace/IPC/Signal.h" +#include "ace/Utils/Object_Manager.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif + +#include "ace/Utils/Containers.h" #if !defined (__ACE_INLINE__) -#include "ace/Signal.i" +#include "ace/IPC/Signal.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Signal, "$Id$") diff --git a/ace/IPC/TLI.cpp b/ace/IPC/TLI.cpp index 056bc09a0a3..fc5e20030b9 100644 --- a/ace/IPC/TLI.cpp +++ b/ace/IPC/TLI.cpp @@ -3,15 +3,18 @@ // Defines the member functions for the base class of the ACE_TLI // abstraction. -#include "ace/TLI.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/TLI.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif ACE_RCSID(ace, TLI, "$Id$") #if defined (ACE_HAS_TLI) #if !defined (__ACE_INLINE__) -#include "ace/TLI.i" +#include "ace/IPC/TLI.i" #endif /* __ACE_INLINE__ */ ACE_ALLOC_HOOK_DEFINE(ACE_TLI) diff --git a/ace/IPC/TLI.h b/ace/IPC/TLI.h index f00e22f48fa..2be92fb425a 100644 --- a/ace/IPC/TLI.h +++ b/ace/IPC/TLI.h @@ -15,13 +15,13 @@ #define ACE_TLI_H #include "ace/pre.h" -#include "ace/IPC_SAP.h" +#include "ace/Sockets/IPC_SAP.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Addr.h" +#include "ace/IPC/Addr.h" #if defined (ACE_HAS_TLI) @@ -99,7 +99,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/TLI.i" +#include "ace/IPC/TLI.i" #endif /* __ACE_INLINE__ */ #endif /* ACE_HAS_TLI */ diff --git a/ace/IPC/TLI.i b/ace/IPC/TLI.i index 8f32186deaf..d8362ab1810 100644 --- a/ace/IPC/TLI.i +++ b/ace/IPC/TLI.i @@ -3,7 +3,7 @@ // TLI.i -#include "ace/TLI.h" +#include "ace/IPC/TLI.h" ACE_INLINE int diff --git a/ace/IPC/TLI_Acceptor.cpp b/ace/IPC/TLI_Acceptor.cpp index 29c1717e767..dd70fcdff7f 100644 --- a/ace/IPC/TLI_Acceptor.cpp +++ b/ace/IPC/TLI_Acceptor.cpp @@ -1,7 +1,10 @@ // $Id$ -#include "ace/TLI_Acceptor.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/TLI_Acceptor.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif ACE_RCSID(ace, TLI_Acceptor, "$Id$") diff --git a/ace/IPC/TLI_Acceptor.h b/ace/IPC/TLI_Acceptor.h index 2112bf4535c..e9ada019f18 100644 --- a/ace/IPC/TLI_Acceptor.h +++ b/ace/IPC/TLI_Acceptor.h @@ -15,14 +15,14 @@ #define ACE_TLI_ACCEPTOR_H #include "ace/pre.h" -#include "ace/TLI.h" +#include "ace/IPC/TLI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Time_Value.h" -#include "ace/TLI_Stream.h" +#include "ace/Timer/Time_Value.h" +#include "ace/IPC/TLI_Stream.h" #if defined (ACE_HAS_TLI) diff --git a/ace/IPC/TLI_Connector.cpp b/ace/IPC/TLI_Connector.cpp index cca3ff1d265..beabfca3d41 100644 --- a/ace/IPC/TLI_Connector.cpp +++ b/ace/IPC/TLI_Connector.cpp @@ -1,15 +1,15 @@ // TLI_Connector.cpp // $Id$ -#include "ace/Handle_Set.h" -#include "ace/TLI_Connector.h" +#include "ace/OS/Handle_Set.h" +#include "ace/IPC/TLI_Connector.h" ACE_RCSID(ace, TLI_Connector, "$Id$") #if defined (ACE_HAS_TLI) #if !defined (__ACE_INLINE__) -#include "ace/TLI_Connector.i" +#include "ace/IPC/TLI_Connector.i" #endif /* __ACE_INLINE__ */ ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Connector) diff --git a/ace/IPC/TLI_Connector.h b/ace/IPC/TLI_Connector.h index 785f109712a..cc6eb0802c8 100644 --- a/ace/IPC/TLI_Connector.h +++ b/ace/IPC/TLI_Connector.h @@ -15,8 +15,11 @@ #define ACE_TLI_CONNECTOR_H #include "ace/pre.h" -#include "ace/TLI_Stream.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/TLI_Stream.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -118,7 +121,7 @@ public: }; #if defined (__ACE_INLINE__) -#include "ace/TLI_Connector.i" +#include "ace/IPC/TLI_Connector.i" #endif /* __ACE_INLINE__ */ #endif /* ACE_HAS_TLI */ diff --git a/ace/IPC/TLI_Stream.cpp b/ace/IPC/TLI_Stream.cpp index a5533d40492..32a8254a2e4 100644 --- a/ace/IPC/TLI_Stream.cpp +++ b/ace/IPC/TLI_Stream.cpp @@ -3,14 +3,14 @@ /* Defines the member functions for the base class of the ACE_TLI_Stream abstraction. */ -#include "ace/TLI_Stream.h" +#include "ace/IPC/TLI_Stream.h" ACE_RCSID(ace, TLI_Stream, "$Id$") #if defined (ACE_HAS_TLI) #if !defined (__ACE_INLINE__) -#include "ace/TLI_Stream.i" +#include "ace/IPC/TLI_Stream.i" #endif /* __ACE_INLINE__ */ ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Stream) diff --git a/ace/IPC/TLI_Stream.h b/ace/IPC/TLI_Stream.h index ba5c08299e4..38c030552e1 100644 --- a/ace/IPC/TLI_Stream.h +++ b/ace/IPC/TLI_Stream.h @@ -15,13 +15,13 @@ #define ACE_TLI_STREAM_H #include "ace/pre.h" -#include "ace/TLI.h" +#include "ace/IPC/TLI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/INET_Addr.h" +#include "ace/IPC/INET_Addr.h" #if defined (ACE_HAS_TLI) @@ -121,7 +121,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/TLI_Stream.i" +#include "ace/IPC/TLI_Stream.i" #endif /* __ACE_INLINE__ */ #endif /* ACE_HAS_TLI */ diff --git a/ace/IPC/TLI_Stream.i b/ace/IPC/TLI_Stream.i index 8452138cea1..1c8f6d37098 100644 --- a/ace/IPC/TLI_Stream.i +++ b/ace/IPC/TLI_Stream.i @@ -3,7 +3,7 @@ // TLI_Stream.i -#include "ace/TLI_Stream.h" +#include "ace/IPC/TLI_Stream.h" ACE_INLINE ssize_t diff --git a/ace/IPC/TTY_IO.cpp b/ace/IPC/TTY_IO.cpp index 8e0e17bb3c1..9039fd4e8af 100644 --- a/ace/IPC/TTY_IO.cpp +++ b/ace/IPC/TTY_IO.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ace/TTY_IO.h" +#include "ace/IPC/TTY_IO.h" ACE_RCSID(ace, TTY_IO, "TTY_IO.cpp,v 4.18 1999/06/02 21:20:14 nanbor Exp") diff --git a/ace/IPC/TTY_IO.h b/ace/IPC/TTY_IO.h index 0f0bdc1b2fb..551dc2d6fd5 100644 --- a/ace/IPC/TTY_IO.h +++ b/ace/IPC/TTY_IO.h @@ -13,15 +13,15 @@ #ifndef ACE_TTY_IO_H #define ACE_TTY_IO_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/DEV_Addr.h" -#include "ace/DEV_Connector.h" -#include "ace/DEV_IO.h" +#include "ace/IPC/DEV_Addr.h" +#include "ace/IPC/DEV_Connector.h" +#include "ace/IPC/DEV_IO.h" /** * @class ACE_TTY_IO diff --git a/ace/IPC/UNIX_Addr.cpp b/ace/IPC/UNIX_Addr.cpp index 5b580cff1ce..383a198305c 100644 --- a/ace/IPC/UNIX_Addr.cpp +++ b/ace/IPC/UNIX_Addr.cpp @@ -1,10 +1,10 @@ // UNIX_Addr.cpp // $Id$ -#include "ace/UNIX_Addr.h" +#include "ace/IPC/UNIX_Addr.h" #if !defined (__ACE_INLINE__) -#include "ace/UNIX_Addr.i" +#include "ace/IPC/UNIX_Addr.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, UNIX_Addr, "$Id$") diff --git a/ace/IPC/UNIX_Addr.h b/ace/IPC/UNIX_Addr.h index fc9be3bdff6..8a4d1c13d20 100644 --- a/ace/IPC/UNIX_Addr.h +++ b/ace/IPC/UNIX_Addr.h @@ -15,8 +15,12 @@ #define ACE_UNIX_ADDR_H #include "ace/pre.h" -#include "ace/Addr.h" -#include "ace/Log_Msg.h" +#include "ace/IPC/Addr.h" + +#ifdef ACE_SUBSET_0 +#include "ace/Logging/Log_Msg.h" +#endif + #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -91,7 +95,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/UNIX_Addr.i" +#include "ace/IPC/UNIX_Addr.i" #endif /* __ACE_INLINE__ */ #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ diff --git a/ace/IPC/UPIPE_Acceptor.cpp b/ace/IPC/UPIPE_Acceptor.cpp index 379155616f3..093e4542428 100644 --- a/ace/IPC/UPIPE_Acceptor.cpp +++ b/ace/IPC/UPIPE_Acceptor.cpp @@ -1,14 +1,14 @@ // UPIPE_Acceptor.cpp // $Id$ -#include "ace/UPIPE_Acceptor.h" +#include "ace/IPC/UPIPE_Acceptor.h" ACE_RCSID(ace, UPIPE_Acceptor, "$Id$") #if defined (ACE_HAS_THREADS) #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/UPIPE_Acceptor.i" +#include "ace/IPC/UPIPE_Acceptor.i" #endif ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Acceptor) diff --git a/ace/IPC/UPIPE_Acceptor.h b/ace/IPC/UPIPE_Acceptor.h index d19151370fc..958a8bcd912 100644 --- a/ace/IPC/UPIPE_Acceptor.h +++ b/ace/IPC/UPIPE_Acceptor.h @@ -16,15 +16,15 @@ #define ACE_UPIPE_ACCEPTOR_H #include "ace/pre.h" -#include "ace/UPIPE_Stream.h" +#include "ace/IPC/UPIPE_Stream.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Synch.h" -#include "ace/SPIPE_Acceptor.h" -#include "ace/Thread_Manager.h" +#include "ace/Threads/Synch.h" +#include "ace/IPC/SPIPE_Acceptor.h" +#include "ace/Threads/Thread_Manager.h" #if defined (ACE_HAS_THREADS) @@ -86,7 +86,7 @@ private: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/UPIPE_Acceptor.i" +#include "ace/IPC/UPIPE_Acceptor.i" #endif #endif /* ACE_HAS_THREADS */ diff --git a/ace/IPC/UPIPE_Addr.h b/ace/IPC/UPIPE_Addr.h index 1a46f564403..88797bf351b 100644 --- a/ace/IPC/UPIPE_Addr.h +++ b/ace/IPC/UPIPE_Addr.h @@ -16,7 +16,7 @@ #define ACE_UPIPE_ADDR_H #include "ace/pre.h" -#include "ace/SPIPE_Addr.h" +#include "ace/IPC/SPIPE_Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/IPC/UPIPE_Connector.cpp b/ace/IPC/UPIPE_Connector.cpp index d2edc143a50..2e74d6e8e5e 100644 --- a/ace/IPC/UPIPE_Connector.cpp +++ b/ace/IPC/UPIPE_Connector.cpp @@ -1,14 +1,14 @@ // UPIPE_Connector.cpp // $Id$ -#include "ace/UPIPE_Connector.h" +#include "ace/IPC/UPIPE_Connector.h" ACE_RCSID(ace, UPIPE_Connector, "$Id$") #if defined (ACE_HAS_THREADS) #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/UPIPE_Connector.i" +#include "ace/IPC/UPIPE_Connector.i" #endif ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Connector) diff --git a/ace/IPC/UPIPE_Connector.h b/ace/IPC/UPIPE_Connector.h index 82053fd59a2..ca5acbef49e 100644 --- a/ace/IPC/UPIPE_Connector.h +++ b/ace/IPC/UPIPE_Connector.h @@ -15,14 +15,14 @@ #define ACE_UPIPE_CONNECTOR_H #include "ace/pre.h" -#include "ace/UPIPE_Stream.h" +#include "ace/IPC/UPIPE_Stream.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Synch.h" -#include "ace/SPIPE_Stream.h" +#include "ace/Threads/Synch.h" +#include "ace/IPC/SPIPE_Stream.h" #if defined (ACE_HAS_THREADS) @@ -104,7 +104,7 @@ public: }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/UPIPE_Connector.i" +#include "ace/IPC/UPIPE_Connector.i" #endif #endif /* ACE_HAS_THREADS */ diff --git a/ace/IPC/UPIPE_Stream.cpp b/ace/IPC/UPIPE_Stream.cpp index dd1aca73cc3..eecd04b92f2 100644 --- a/ace/IPC/UPIPE_Stream.cpp +++ b/ace/IPC/UPIPE_Stream.cpp @@ -1,14 +1,14 @@ // UPIPE_Stream.cpp // $Id$ -#include "ace/UPIPE_Stream.h" +#include "ace/IPC/UPIPE_Stream.h" ACE_RCSID(ace, UPIPE_Stream, "$Id$") #if defined (ACE_HAS_THREADS) #if !defined (__ACE_INLINE__) -#include "ace/UPIPE_Stream.i" +#include "ace/IPC/UPIPE_Stream.i" #endif /* __ACE_INLINE__ */ diff --git a/ace/IPC/UPIPE_Stream.h b/ace/IPC/UPIPE_Stream.h index 8fd79a1c269..6675f63b4af 100644 --- a/ace/IPC/UPIPE_Stream.h +++ b/ace/IPC/UPIPE_Stream.h @@ -16,16 +16,16 @@ #define ACE_UPIPE_STREAM_H #include "ace/pre.h" -#include "ace/Stream.h" +#include "ace/Streams/Stream.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Synch.h" -#include "ace/SPIPE.h" -#include "ace/Message_Queue.h" -#include "ace/UPIPE_Addr.h" +#include "ace/Threads/Synch.h" +#include "ace/IPC/SPIPE.h" +#include "ace/Streams/Message_Queue.h" +#include "ace/IPC/UPIPE_Addr.h" #if defined (ACE_HAS_THREADS) @@ -129,7 +129,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/UPIPE_Stream.i" +#include "ace/IPC/UPIPE_Stream.i" #endif /* __ACE_INLINE__ */ #endif /* ACE_HAS_THREADS */ diff --git a/ace/IPC/XTI_ATM_Mcast.cpp b/ace/IPC/XTI_ATM_Mcast.cpp index 0892672635e..6f1e89afb6d 100644 --- a/ace/IPC/XTI_ATM_Mcast.cpp +++ b/ace/IPC/XTI_ATM_Mcast.cpp @@ -1,14 +1,14 @@ // XTI_ATM_Mcast.cpp // $Id$ -#include "ace/XTI_ATM_Mcast.h" +#include "ace/IPC/XTI_ATM_Mcast.h" ACE_RCSID(ace, XTI_ATM_Mcast, "$Id$") #if defined (ACE_HAS_XTI_ATM) #if !defined (__ACE_INLINE__) -#include "ace/XTI_ATM_Mcast.i" +#include "ace/IPC/XTI_ATM_Mcast.i" #endif /* __ACE_INLINE__ */ ACE_ALLOC_HOOK_DEFINE(ACE_XTI_ATM_Mcast) diff --git a/ace/IPC/XTI_ATM_Mcast.h b/ace/IPC/XTI_ATM_Mcast.h index ed1ef058303..6611876bace 100644 --- a/ace/IPC/XTI_ATM_Mcast.h +++ b/ace/IPC/XTI_ATM_Mcast.h @@ -15,8 +15,8 @@ #define ACE_XTI_ATM_MCAST_H #include "ace/pre.h" -#include "ace/TLI_Connector.h" -#include "ace/ATM_Addr.h" +#include "ace/IPC/TLI_Connector.h" +#include "ace/ATM/ATM_Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -121,7 +121,7 @@ public: }; #if defined (__ACE_INLINE__) -#include "ace/XTI_ATM_Mcast.i" +#include "ace/IPC/XTI_ATM_Mcast.i" #endif /* __ACE_INLINE__ */ #endif /* ACE_HAS_XTI_ATM */ diff --git a/ace/Streams/Stream.cpp b/ace/Streams/Stream.cpp index f72ebd4acfb..d7f0f4181c8 100644 --- a/ace/Streams/Stream.cpp +++ b/ace/Streams/Stream.cpp @@ -5,16 +5,16 @@ #define ACE_STREAM_C //#include "ace/Module.h" -#include "ace/Stream.h" +#include "ace/Streams/Stream.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Stream_Modules.h" +#include "ace/Streams/Stream_Modules.h" #if !defined (__ACE_INLINE__) -#include "ace/Stream.i" +#include "ace/Streams/Stream.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Stream, "$Id$") diff --git a/ace/Streams/Stream.h b/ace/Streams/Stream.h index f4f432e10f3..5fedbf3cfe6 100644 --- a/ace/Streams/Stream.h +++ b/ace/Streams/Stream.h @@ -21,10 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/IO_Cntl_Msg.h" -#include "ace/Message_Block.h" -#include "ace/Time_Value.h" -#include "ace/Module.h" +#include "ace/Utils/IO_Cntl_Msg.h" +#include "ace/Utils/Message_Block.h" +#include "ace/Timer/Time_Value.h" +#include "ace/Streams/Module.h" // Forward decls. template<ACE_SYNCH_DECL> class ACE_Stream_Iterator; @@ -217,11 +217,11 @@ private: }; #if defined (__ACE_INLINE__) -#include "ace/Stream.i" +#include "ace/Streams/Stream.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Stream.cpp" +#include "ace/Streams/Stream.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) |