diff options
68 files changed, 434 insertions, 239 deletions
diff --git a/ChangeLog b/ChangeLog index cf3a8ac4d37..a0059541842 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,105 @@ +Sun Jun 22 03:27:10 UTC 2003 Don Hinton <dhinton@dresystems.com> + + * ace/ACE.h: + * ace/ARGV.h: + * ace/Array_Base.cpp: + * ace/Array_Base.h: + * ace/Asynch_Connector.h: + * ace/Asynch_IO.cpp: + * ace/Asynch_IO.h: + * ace/Asynch_Pseudo_Task.h: + * ace/Based_Pointer_Repository.h: + * ace/DEV.cpp: + * ace/DEV_Addr.h: + * ace/DEV_Connector.cpp: + * ace/DEV_IO.h: + * ace/DEV_IO.i: + * ace/DLL.h: + * ace/DLL_Manager.cpp: + * ace/DLL_Manager.h: + * ace/Date_Time.h: + * ace/Date_Time.i: + * ace/Event_Handler.h: + * ace/Event_Handler_T.i: + * ace/FIFO.h: + * ace/FIFO_Recv.h: + * ace/FIFO_Recv.i: + * ace/FIFO_Recv_Msg.h: + * ace/FIFO_Send.h: + * ace/FIFO_Send.i: + * ace/FIFO_Send_Msg.h: + * ace/FILE.cpp: + * ace/FILE_Addr.h: + * ace/FILE_IO.h: + * ace/FILE_IO.i: + * ace/Flag_Manip.h: + * ace/Flag_Manip.i: + * ace/Free_List.h: + * ace/Functor.h: + * ace/Functor.i: + * ace/Get_Opt.cpp: + * ace/Handle_Ops.cpp: + * ace/Handle_Ops.h: + * ace/Handle_Set.h: + * ace/Lib_Find.h: + * ace/Malloc_Allocator.h: + * ace/Malloc_Allocator.i: + * ace/Malloc_Base.h: + * ace/Message_Block_T.cpp: + * ace/OS.h: + * ace/Parse_Node.cpp: + * ace/Process.h: + * ace/Read_Buffer.h: + * ace/Service_Object.h: + * ace/Sock_Connect.h: + * ace/Thread_Control.h: + * ace/Thread_Exit.h: + * ace/Typed_SV_Message.h: + * ace/Unbounded_Queue.h: + Removed include of OS.h and/or ACE.h from headers and adjusted + includes in headers and other files by including appropriate + headers in order to reduce dependencies as part of the + subsetting effort. + + * ace/OS.h: + * ace/Asynch_IO.cpp: + * ace/Asynch_IO.h: + Changed u_long to unsigned long to help remove dependencies. + Moved the typedef for TRANSMIT_FILE_BUFFERS here from OS.h. + + * ace/Functor.h: + * ace/Functor.i: + Changed u_long to unsigned long to help remove dependencies. + + * ace/OS.h: + * ace/Global_Macros.h: + Moved definitions for many macros including + LPSECURITY_ATTRIBUTES and GENERIC_READ, etc... here from OS.h. + Moved the ACE_ALLOCATOR_* macros here from OS.h. + + * ace/Makefile.ace: + Added Date_Time so it will get build if + ACE_LACKS_INLINE_FUNCTIONS is defined. + + * ace/os_include/os_pthread.h: + Added include of ace/OS_Export.h if ACE_HAS_POSIX_SEM to pick up + ACE_Export. + + * ace/OS.h: + * ace/os_include/os_signal.h: + Moved ACE_SIGRTMIN, etc., defines here from OS.h. + + * ace/OS.h: + * ace/os_include/os_stdio.h: + Moved ACE_OVERLAPPED typedef here from OS.h. + + * examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp: + * websvcs/lib/URL_Addr.i: + Added include of OS.h. + + * tests/CDR_File_Test.cpp: + Added include of ACE.h. + Sat Jun 21 13:47:28 UTC 2003 Don Hinton <dhinton@dresystems.com> * ace/OS.h: @@ -277,7 +379,6 @@ Wed Jun 18 17:20:28 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> Noseworthy <j.russell.noseworthy@objectsciences.com> for providing these patches. ->>>>>>> 4.5220 Wed Jun 18 15:59:18 UTC 2003 Don Hinton <dhinton@dresystems.com> * ace/OS.h: diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e7993f3f754..f5a0c956379 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Sun Jun 22 03:27:10 UTC 2003 Don Hinton <dhinton@dresystems.com> + + * tao/Cleanup_Func_Registry.h: + Due to subsetting in ACE, added include of OS.h. + + * tao/Notify_Handler.h: + Due to subsetting in ACE, added include of Global_Macros.h. + + Sat Jun 21 22:29:16 2003 Pradeep Gore <pradeep@oomworks.com> * orbsvcs\tests\Notify\lib\Makefile.bor: diff --git a/TAO/tao/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h index 1a6bfaf294f..e5668d97d29 100644 --- a/TAO/tao/Cleanup_Func_Registry.h +++ b/TAO/tao/Cleanup_Func_Registry.h @@ -21,6 +21,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Array_Base.h" +#include "ace/OS.h" // for ACE_CLEANUP_FUNC /** * @class TAO_Cleanup_Func_Registry diff --git a/TAO/tao/Notify_Handler.h b/TAO/tao/Notify_Handler.h index 6ab4b9e2f13..ebf9b9cc4de 100644 --- a/TAO/tao/Notify_Handler.h +++ b/TAO/tao/Notify_Handler.h @@ -21,6 +21,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Event_Handler.h" +#include "ace/Global_Macros.h" class TAO_Transport; class ACE_Allocator; diff --git a/ace/ACE.h b/ace/ACE.h index 1972b3e679f..5f9e4df434f 100644 --- a/ace/ACE.h +++ b/ace/ACE.h @@ -14,7 +14,7 @@ #define ACE_ACE_H #include "ace/pre.h" -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,6 +25,7 @@ #include "ace/Lib_Find.h" #include "ace/Init_ACE.h" #include "ace/Sock_Connect.h" +#include "ace/Default_Constants.h" // Forward declarations. class ACE_Time_Value; diff --git a/ace/ARGV.h b/ace/ARGV.h index 696d69f7512..68d0bfd21d2 100644 --- a/ace/ARGV.h +++ b/ace/ARGV.h @@ -21,7 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" #include "ace/Unbounded_Queue.h" /** diff --git a/ace/Array_Base.cpp b/ace/Array_Base.cpp index 7914a135c2d..3b84d99d070 100644 --- a/ace/Array_Base.cpp +++ b/ace/Array_Base.cpp @@ -3,7 +3,6 @@ #ifndef ACE_ARRAY_BASE_C #define ACE_ARRAY_BASE_C -#include "ace/Malloc_Base.h" #include "ace/Array_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -14,6 +13,9 @@ #include "ace/Array_Base.inl" #endif /* __ACE_INLINE__ */ +#include "ace/Malloc_Base.h" +#include "ace/os_include/os_errno.h" + ACE_RCSID(ace, Array_Base, "$Id$") diff --git a/ace/Array_Base.h b/ace/Array_Base.h index 8e335ab4578..686eb6205b1 100644 --- a/ace/Array_Base.h +++ b/ace/Array_Base.h @@ -20,7 +20,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Global_Macros.h" -#include "ace/OS.h" #include "ace/Malloc_Base.h" // Forward declaration. diff --git a/ace/Asynch_Connector.h b/ace/Asynch_Connector.h index eeb3c3f3818..409bc4f6571 100644 --- a/ace/Asynch_Connector.h +++ b/ace/Asynch_Connector.h @@ -14,7 +14,7 @@ #define ACE_ASYNCH_CONNECTOR_H #include "ace/pre.h" -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Asynch_IO.cpp b/ace/Asynch_IO.cpp index 25c7610c60a..f6678a0c11b 100644 --- a/ace/Asynch_IO.cpp +++ b/ace/Asynch_IO.cpp @@ -36,7 +36,7 @@ ACE_Asynch_Result::completion_key (void) const return this->implementation ()->completion_key (); } -u_long +unsigned long ACE_Asynch_Result::error (void) const { return this->implementation ()->error (); @@ -48,13 +48,13 @@ ACE_Asynch_Result::event (void) const return this->implementation ()->event (); } -u_long +unsigned long ACE_Asynch_Result::offset (void) const { return this->implementation ()->offset (); } -u_long +unsigned long ACE_Asynch_Result::offset_high (void) const { return this->implementation ()->offset_high (); @@ -438,8 +438,8 @@ ACE_Asynch_Read_File::open (ACE_Handler &handler, int ACE_Asynch_Read_File::read (ACE_Message_Block &message_block, size_t bytes_to_read, - u_long offset, - u_long offset_high, + unsigned long offset, + unsigned long offset_high, const void *act, int priority, int signal_number) @@ -457,8 +457,8 @@ ACE_Asynch_Read_File::read (ACE_Message_Block &message_block, int ACE_Asynch_Read_File::readv (ACE_Message_Block &message_block, size_t bytes_to_read, - u_long offset, - u_long offset_high, + unsigned long offset, + unsigned long offset_high, const void *act, int priority, int signal_number) @@ -550,8 +550,8 @@ ACE_Asynch_Write_File::open (ACE_Handler &handler, int ACE_Asynch_Write_File::write (ACE_Message_Block &message_block, size_t bytes_to_write, - u_long offset, - u_long offset_high, + unsigned long offset, + unsigned long offset_high, const void *act, int priority, int signal_number) @@ -569,8 +569,8 @@ ACE_Asynch_Write_File::write (ACE_Message_Block &message_block, int ACE_Asynch_Write_File::writev (ACE_Message_Block &message_block, size_t bytes_to_write, - u_long offset, - u_long offset_high, + unsigned long offset, + unsigned long offset_high, const void *act, int priority, int signal_number) @@ -876,10 +876,10 @@ int ACE_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, Header_And_Trailer *header_and_trailer, size_t bytes_to_write, - u_long offset, - u_long offset_high, + unsigned long offset, + unsigned long offset_high, size_t bytes_per_send, - u_long flags, + unsigned long flags, const void *act, int priority, int signal_number) @@ -942,7 +942,7 @@ ACE_Asynch_Transmit_File::Result::bytes_per_send (void) const return this->implementation ()->bytes_per_send (); } -u_long +unsigned long ACE_Asynch_Transmit_File::Result::flags (void) const { return this->implementation ()->flags (); diff --git a/ace/Asynch_IO.h b/ace/Asynch_IO.h index 14d2e3d22cf..73d1a1fc6c4 100644 --- a/ace/Asynch_IO.h +++ b/ace/Asynch_IO.h @@ -27,7 +27,7 @@ #define ACE_ASYNCH_IO_H #include "ace/pre.h" -#include "ace/config-all.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -35,7 +35,37 @@ #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)) -#include "ace/OS.h" +#include "ace/os_include/os_signal.h" +#include "ace/os_include/sys/os_socket.h" + +# if defined (ACE_WIN32) && ! defined (ACE_HAS_WINCE) \ + && ! defined (ACE_HAS_PHARLAP) +typedef TRANSMIT_FILE_BUFFERS ACE_TRANSMIT_FILE_BUFFERS; +typedef LPTRANSMIT_FILE_BUFFERS ACE_LPTRANSMIT_FILE_BUFFERS; +typedef PTRANSMIT_FILE_BUFFERS ACE_PTRANSMIT_FILE_BUFFERS; + +# define ACE_INFINITE INFINITE +# define ACE_STATUS_TIMEOUT STATUS_TIMEOUT +# define ACE_WAIT_FAILED WAIT_FAILED +# define ACE_WAIT_TIMEOUT WAIT_TIMEOUT +# else /* ACE_WIN32 */ +struct ACE_TRANSMIT_FILE_BUFFERS +{ + void *Head; + size_t HeadLength; + void *Tail; + size_t TailLength; +}; +typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_PTRANSMIT_FILE_BUFFERS; +typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_LPTRANSMIT_FILE_BUFFERS; + +# if !defined (ACE_INFINITE) +# define ACE_INFINITE LONG_MAX +# endif /* ACE_INFINITE */ +# define ACE_STATUS_TIMEOUT LONG_MAX +# define ACE_WAIT_FAILED LONG_MAX +# define ACE_WAIT_TIMEOUT LONG_MAX +# endif /* ACE_WIN32 */ // Forward declarations class ACE_Proactor; @@ -46,6 +76,7 @@ class ACE_Addr; // Forward declarations class ACE_Asynch_Result_Impl; +class ACE_Time_Value; /** * @class ACE_Asynch_Result @@ -85,7 +116,7 @@ public: const void *completion_key (void) const; /// Error value if the operation fails. - u_long error (void) const; + unsigned long error (void) const; /** * On WIN32, this returns the event associated with the OVERLAPPED @@ -103,8 +134,8 @@ public: * @@ On POSIX4-Unix, offset_high should be supported using * aiocb64. */ - u_long offset (void) const; - u_long offset_high (void) const; + unsigned long offset (void) const; + unsigned long offset_high (void) const; /** * Priority of the operation. @@ -1101,7 +1132,7 @@ public: size_t bytes_per_send (void) const; /// Flags which were passed into transmit file. - u_long flags (void) const; + unsigned long flags (void) const; /// Get the implementation class. ACE_Asynch_Transmit_File_Result_Impl *implementation (void) const; diff --git a/ace/Asynch_Pseudo_Task.h b/ace/Asynch_Pseudo_Task.h index 66d1866a664..db838f90f91 100644 --- a/ace/Asynch_Pseudo_Task.h +++ b/ace/Asynch_Pseudo_Task.h @@ -14,7 +14,7 @@ #define ACE_ASYNCH_PSEUDO_TASK_H #include "ace/pre.h" -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/ace/Based_Pointer_Repository.h b/ace/Based_Pointer_Repository.h index 82c950838af..7bf1e8ca794 100644 --- a/ace/Based_Pointer_Repository.h +++ b/ace/Based_Pointer_Repository.h @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" - // Forward decl., using the "Cheshire Cat" technique. class ACE_Based_Pointer_Repository_Rep; diff --git a/ace/DEV.cpp b/ace/DEV.cpp index 0aa66003edb..fce2d15362a 100644 --- a/ace/DEV.cpp +++ b/ace/DEV.cpp @@ -8,6 +8,8 @@ #include "ace/DEV.i" #endif +#include "ace/OS.h" + ACE_RCSID(ace, DEV, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_DEV) diff --git a/ace/DEV_Addr.h b/ace/DEV_Addr.h index a549fb74b6d..4d59500a670 100644 --- a/ace/DEV_Addr.h +++ b/ace/DEV_Addr.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" +#include "ace/os_include/os_dirent.h" /** * @class ACE_DEV_Addr diff --git a/ace/DEV_Connector.cpp b/ace/DEV_Connector.cpp index 35463c05aaf..2334e952719 100644 --- a/ace/DEV_Connector.cpp +++ b/ace/DEV_Connector.cpp @@ -7,6 +7,8 @@ #include "ace/DEV_Connector.i" #endif +#include "ace/Handle_Ops.h" + ACE_RCSID(ace, DEV_Connector, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_DEV_Connector) diff --git a/ace/DEV_IO.h b/ace/DEV_IO.h index b0b593fb280..5b19581e243 100644 --- a/ace/DEV_IO.h +++ b/ace/DEV_IO.h @@ -22,8 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/ACE.h" - +#include "ace/os_include/os_stdio.h" +#include "ace/os_include/sys/os_uio.h" /** * @class ACE_DEV_IO diff --git a/ace/DEV_IO.i b/ace/DEV_IO.i index 0e18eee81ba..aced645393c 100644 --- a/ace/DEV_IO.i +++ b/ace/DEV_IO.i @@ -3,6 +3,8 @@ // DEV_IO.i +#include "ace/ACE.h" + // Send exactly N bytes from BUF to this device. Keeping trying until // this many bytes are sent. diff --git a/ace/DLL.h b/ace/DLL.h index 07648499831..12bacd7c551 100644 --- a/ace/DLL.h +++ b/ace/DLL.h @@ -15,12 +15,15 @@ #define ACE_DLL_H #include "ace/pre.h" -#include "ace/OS.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Global_Macros.h" +#include "ace/os_include/os_dlfcn.h" + class ACE_DLL_Handle; /** diff --git a/ace/DLL_Manager.cpp b/ace/DLL_Manager.cpp index 2ab38cdec21..3a180ad2f2a 100644 --- a/ace/DLL_Manager.cpp +++ b/ace/DLL_Manager.cpp @@ -10,6 +10,7 @@ #include "ace/OS.h" #include "ace/Lib_Find.h" #include "ace/Object_Manager.h" +#include "ace/SString.h" ACE_RCSID(ace, DLL, "$Id$") diff --git a/ace/DLL_Manager.h b/ace/DLL_Manager.h index 136f3fa8d8a..de029b05826 100644 --- a/ace/DLL_Manager.h +++ b/ace/DLL_Manager.h @@ -15,15 +15,15 @@ #define ACE_DLL_MANAGER_H #include "ace/pre.h" -#include "ace/OS.h" #include "ace/Synch_T.h" -#include "ace/Auto_Ptr.h" -#include "ace/SString.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Auto_Ptr.h" +#include "ace/SStringfwd.h" + #define ACE_DEFAULT_DLL_MANAGER_SIZE 1024 /** diff --git a/ace/Date_Time.h b/ace/Date_Time.h index 4343059a2f3..41656491ed0 100644 --- a/ace/Date_Time.h +++ b/ace/Date_Time.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" +class ACE_Time_Value; /** * @class ACE_Date_Time diff --git a/ace/Date_Time.i b/ace/Date_Time.i index d2fc8d83bcc..a3b26d21360 100644 --- a/ace/Date_Time.i +++ b/ace/Date_Time.i @@ -3,6 +3,9 @@ // Date_Time.i +#include "ace/OS.h" +#include "ace/Time_Value.h" + ASYS_INLINE void ACE_Date_Time::update (void) { diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h index e5f0df47427..f3b60e9c2b5 100644 --- a/ace/Event_Handler.h +++ b/ace/Event_Handler.h @@ -21,6 +21,9 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/OS.h" +#include "ace/os_include/os_signal.h" +// need to fix THR_DETACHED, then we can get rid of OS.h +#include "ace/os_include/os_pthread.h" // Forward declaration. class ACE_Message_Block; @@ -28,7 +31,7 @@ class ACE_Reactor; class ACE_Thread_Manager; class ACE_Process; -typedef u_long ACE_Reactor_Mask; +typedef unsigned long ACE_Reactor_Mask; /** * @class ACE_Event_Handler diff --git a/ace/Event_Handler_T.i b/ace/Event_Handler_T.i index 31d030c555f..d096ebeed78 100644 --- a/ace/Event_Handler_T.i +++ b/ace/Event_Handler_T.i @@ -1,6 +1,8 @@ /* -*- C++ -*- */ // $Id$ +#include "ace/Global_Macros.h" + template<class T> ACE_INLINE void ACE_Event_Handler_T<T>::op_handler (T *op) { diff --git a/ace/FIFO.h b/ace/FIFO.h index fd94e7026bc..c44c8355e05 100644 --- a/ace/FIFO.h +++ b/ace/FIFO.h @@ -15,12 +15,15 @@ #define ACE_FIFO_H #include "ace/pre.h" -#include "ace/IPC_SAP.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/IPC_SAP.h" +#include "ace/os_include/os_limits.h" + /** * @class ACE_FIFO * diff --git a/ace/FIFO_Recv.h b/ace/FIFO_Recv.h index e0c9766cd46..dcb27ee0a98 100644 --- a/ace/FIFO_Recv.h +++ b/ace/FIFO_Recv.h @@ -22,7 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/ACE.h" +#include "ace/os_include/os_fcntl.h" +#include "ace/Default_Constants.h" /** * @class ACE_FIFO_Recv diff --git a/ace/FIFO_Recv.i b/ace/FIFO_Recv.i index 693b2a944fe..82f1317d013 100644 --- a/ace/FIFO_Recv.i +++ b/ace/FIFO_Recv.i @@ -3,6 +3,9 @@ // FIFO_Recv.i +#include "ace/OS.h" +#include "ace/ACE.h" + ASYS_INLINE ssize_t ACE_FIFO_Recv::recv (void *buf, size_t len) { diff --git a/ace/FIFO_Recv_Msg.h b/ace/FIFO_Recv_Msg.h index 493ab63e436..a05da92e4d0 100644 --- a/ace/FIFO_Recv_Msg.h +++ b/ace/FIFO_Recv_Msg.h @@ -21,6 +21,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +// Forward decls +class ACE_Str_Buf; + /** * @class ACE_FIFO_Recv_Msg * diff --git a/ace/FIFO_Send.h b/ace/FIFO_Send.h index 3f553deb88b..29a6c0f8cc6 100644 --- a/ace/FIFO_Send.h +++ b/ace/FIFO_Send.h @@ -22,7 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/ACE.h" +#include "ace/os_include/os_fcntl.h" +#include "ace/Default_Constants.h" /** * @class ACE_FIFO_Send diff --git a/ace/FIFO_Send.i b/ace/FIFO_Send.i index c7e20eae8d2..bcc7abecb93 100644 --- a/ace/FIFO_Send.i +++ b/ace/FIFO_Send.i @@ -3,6 +3,9 @@ // FIFO_Send.i +#include "ace/OS.h" +#include "ace/ACE.h" + ASYS_INLINE ssize_t ACE_FIFO_Send::send (const void *buf, size_t len) { diff --git a/ace/FIFO_Send_Msg.h b/ace/FIFO_Send_Msg.h index cc4ae785e41..f4f858d5ba9 100644 --- a/ace/FIFO_Send_Msg.h +++ b/ace/FIFO_Send_Msg.h @@ -21,6 +21,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +// Forward Decls +class ACE_Str_Buf; + /** * @class ACE_FIFO_Send_Msg * diff --git a/ace/FILE.cpp b/ace/FILE.cpp index ea5c7b950ec..509a35f3a6b 100644 --- a/ace/FILE.cpp +++ b/ace/FILE.cpp @@ -10,6 +10,8 @@ #include "ace/FILE.i" #endif +#include "ace/OS.h" + ACE_RCSID(ace, FILE, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_FILE) diff --git a/ace/FILE_Addr.h b/ace/FILE_Addr.h index b0307e6f856..7c601dfadf8 100644 --- a/ace/FILE_Addr.h +++ b/ace/FILE_Addr.h @@ -22,6 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Flag_Manip.h" +#include "ace/os_include/os_dirent.h" /** * @class ACE_FILE_Addr diff --git a/ace/FILE_IO.h b/ace/FILE_IO.h index d7bfcf63290..38e4a0f6394 100644 --- a/ace/FILE_IO.h +++ b/ace/FILE_IO.h @@ -23,10 +23,12 @@ #include "ace/FILE_Addr.h" // Used in the FILE_IO.h file... -#include "ace/ACE.h" +#include "ace/os_include/os_stdio.h" +#include "ace/os_include/sys/os_uio.h" // Forward decl. class ACE_Message_Block; +class ACE_Time_Value; /** * @class ACE_FILE_IO diff --git a/ace/FILE_IO.i b/ace/FILE_IO.i index c987b604413..fd9a634a1be 100644 --- a/ace/FILE_IO.i +++ b/ace/FILE_IO.i @@ -3,6 +3,8 @@ // FILE_IO.i +#include "ace/ACE.h" + ASYS_INLINE ssize_t ACE_FILE_IO::sendv_n (const iovec iov[], int n) const { diff --git a/ace/Flag_Manip.h b/ace/Flag_Manip.h index b9c5dc1cf91..3ca3b9e87d2 100644 --- a/ace/Flag_Manip.h +++ b/ace/Flag_Manip.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" +#include "ace/Global_Macros.h" class ACE_Export ACE_Flag_Manip { diff --git a/ace/Flag_Manip.i b/ace/Flag_Manip.i index b041e1f19d8..57f6aad2fbb 100644 --- a/ace/Flag_Manip.i +++ b/ace/Flag_Manip.i @@ -3,6 +3,8 @@ // Return flags currently associated with handle. +#include "ace/OS.h" + ASYS_INLINE int ACE_Flag_Manip::get_flags (ACE_HANDLE handle) { diff --git a/ace/Free_List.h b/ace/Free_List.h index 339cc9b9200..564f9f43aec 100644 --- a/ace/Free_List.h +++ b/ace/Free_List.h @@ -14,7 +14,7 @@ #define ACE_FREE_LIST_H #include "ace/pre.h" -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Functor.h b/ace/Functor.h index 8a3d13df2a5..4ff04a0c72d 100644 --- a/ace/Functor.h +++ b/ace/Functor.h @@ -32,12 +32,15 @@ #define ACE_FUNCTOR_H #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/ACE_export.h" +#include "ace/Basic_Types.h" + ////////////////////////////////////////////////////////////// // GOF Command Pattern Classes and Template Specializations // ////////////////////////////////////////////////////////////// @@ -93,7 +96,7 @@ class ACE_Export ACE_Hash<char> { public: /// Simply returns t - u_long operator () (char t) const; + unsigned long operator () (char t) const; }; ACE_TEMPLATE_SPECIALIZATION @@ -106,7 +109,7 @@ class ACE_Export ACE_Hash<signed char> { public: /// Simply returns t - u_long operator () (signed char t) const; + unsigned long operator () (signed char t) const; }; ACE_TEMPLATE_SPECIALIZATION @@ -119,7 +122,7 @@ class ACE_Export ACE_Hash<unsigned char> { public: /// Simply returns t - u_long operator () (unsigned char t) const; + unsigned long operator () (unsigned char t) const; }; // @@ ADD HASHES FOR ACE TYPES @@ -134,7 +137,7 @@ class ACE_Export ACE_Hash<ACE_INT16> { public: /// Simply returns t - u_long operator () (ACE_INT16 t) const; + unsigned long operator () (ACE_INT16 t) const; }; ACE_TEMPLATE_SPECIALIZATION @@ -147,7 +150,7 @@ class ACE_Export ACE_Hash<ACE_UINT16> { public: /// Simply returns t - u_long operator () (ACE_UINT16 t) const; + unsigned long operator () (ACE_UINT16 t) const; }; ACE_TEMPLATE_SPECIALIZATION @@ -160,7 +163,7 @@ class ACE_Export ACE_Hash<ACE_INT32> { public: /// Simply returns t - u_long operator () (ACE_INT32 t) const; + unsigned long operator () (ACE_INT32 t) const; }; ACE_TEMPLATE_SPECIALIZATION @@ -173,7 +176,7 @@ class ACE_Export ACE_Hash<ACE_UINT32> { public: /// Simply returns t - u_long operator () (ACE_UINT32 t) const; + unsigned long operator () (ACE_UINT32 t) const; }; ACE_TEMPLATE_SPECIALIZATION @@ -186,7 +189,7 @@ class ACE_Export ACE_Hash<ACE_UINT64> { public: /// Simply returns t - u_long operator () (ACE_UINT64 t) const; + unsigned long operator () (ACE_UINT64 t) const; }; // @@ DONE ADDING HASHES FOR ACE TYPES @@ -201,7 +204,7 @@ class ACE_Export ACE_Hash<const ACE_TCHAR *> { public: /// Calls ACE::hash_pjw - u_long operator () (const ACE_TCHAR *t) const; + unsigned long operator () (const ACE_TCHAR *t) const; }; ACE_TEMPLATE_SPECIALIZATION @@ -214,7 +217,7 @@ class ACE_Export ACE_Hash<ACE_TCHAR *> { public: /// Calls ACE::hash_pjw - u_long operator () (const ACE_TCHAR *t) const; + unsigned long operator () (const ACE_TCHAR *t) const; }; ACE_TEMPLATE_SPECIALIZATION @@ -226,7 +229,7 @@ ACE_TEMPLATE_SPECIALIZATION class ACE_Export ACE_Hash<void *> { public: - u_long operator () (const void *) const; + unsigned long operator () (const void *) const; }; ACE_TEMPLATE_SPECIALIZATION @@ -406,7 +409,7 @@ class ACE_Export ACE_Hash<const ACE_ANTI_TCHAR *> { public: /// Calls ACE::hash_pjw - u_long operator () (const ACE_ANTI_TCHAR *t) const; + unsigned long operator () (const ACE_ANTI_TCHAR *t) const; }; ACE_TEMPLATE_SPECIALIZATION @@ -419,7 +422,7 @@ class ACE_Export ACE_Hash<ACE_ANTI_TCHAR *> { public: /// Calls ACE::hash_pjw - u_long operator () (const ACE_ANTI_TCHAR *t) const; + unsigned long operator () (const ACE_ANTI_TCHAR *t) const; }; ACE_TEMPLATE_SPECIALIZATION diff --git a/ace/Functor.i b/ace/Functor.i index 1f856a9cbd7..559bc630570 100644 --- a/ace/Functor.i +++ b/ace/Functor.i @@ -29,6 +29,9 @@ // // ============================================================================ +#include "ace/ACE.h" +#include "ace/OS.h" + ////////////////////////////////////////////////////////////// // GOF Command Pattern Classes and Template Specializations // ////////////////////////////////////////////////////////////// @@ -52,56 +55,56 @@ ACE_Command_Base::~ACE_Command_Base (void) //////////////////////////////////////////////////////////// //ACE_TEMPLATE_METHOD_SPECIALIZATION -ACE_INLINE u_long +ACE_INLINE unsigned long ACE_Hash<char>::operator () (char t) const { return t; } //ACE_TEMPLATE_METHOD_SPECIALIZATION -ACE_INLINE u_long +ACE_INLINE unsigned long ACE_Hash<signed char>::operator () (signed char t) const { return t; } //ACE_TEMPLATE_METHOD_SPECIALIZATION -ACE_INLINE u_long +ACE_INLINE unsigned long ACE_Hash<unsigned char>::operator () (unsigned char t) const { return t; } //ACE_TEMPLATE_METHOD_SPECIALIZATION -ACE_INLINE u_long +ACE_INLINE unsigned long ACE_Hash<ACE_INT16>::operator () (ACE_INT16 t) const { return t; } //ACE_TEMPLATE_METHOD_SPECIALIZATION -ACE_INLINE u_long +ACE_INLINE unsigned long ACE_Hash<ACE_UINT16>::operator () (ACE_UINT16 t) const { return t; } //ACE_TEMPLATE_METHOD_SPECIALIZATION -ACE_INLINE u_long +ACE_INLINE unsigned long ACE_Hash<ACE_INT32>::operator () (ACE_INT32 t) const { return t; } //ACE_TEMPLATE_METHOD_SPECIALIZATION -ACE_INLINE u_long +ACE_INLINE unsigned long ACE_Hash<ACE_UINT32>::operator () (ACE_UINT32 t) const { return t; } //ACE_TEMPLATE_METHOD_SPECIALIZATION -ACE_INLINE u_long +ACE_INLINE unsigned long ACE_Hash<ACE_UINT64>::operator () (ACE_UINT64 t) const { return ACE_U64_TO_U32 (t); @@ -109,24 +112,24 @@ ACE_Hash<ACE_UINT64>::operator () (ACE_UINT64 t) const //ACE_TEMPLATE_METHOD_SPECIALIZATION -ACE_INLINE u_long +ACE_INLINE unsigned long ACE_Hash<const ACE_TCHAR *>::operator () (const ACE_TCHAR *t) const { return ACE::hash_pjw (t); } //ACE_TEMPLATE_METHOD_SPECIALIZATION -ACE_INLINE u_long +ACE_INLINE unsigned long ACE_Hash<ACE_TCHAR *>::operator () (const ACE_TCHAR *t) const { return ACE::hash_pjw (t); } //ACE_TEMPLATE_METHOD_SPECIALIZATION -ACE_INLINE u_long +ACE_INLINE unsigned long ACE_Hash<void *>::operator () (const void *t) const { - return (u_long)((ptrdiff_t) t); + return (unsigned long)((ptrdiff_t) t); } /***********************************************************************/ @@ -197,14 +200,14 @@ ACE_Less_Than<ACE_TCHAR *>::operator () (const ACE_TCHAR *lhs, const ACE_TCHAR * #if defined (ACE_USES_WCHAR) //ACE_TEMPLATE_METHOD_SPECIALIZATION -ACE_INLINE u_long +ACE_INLINE unsigned long ACE_Hash<const ACE_ANTI_TCHAR *>::operator () (const ACE_ANTI_TCHAR *t) const { return ACE::hash_pjw (t); } //ACE_TEMPLATE_METHOD_SPECIALIZATION -ACE_INLINE u_long +ACE_INLINE unsigned long ACE_Hash<ACE_ANTI_TCHAR *>::operator () (const ACE_ANTI_TCHAR *t) const { return ACE::hash_pjw (t); diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp index 3dd26002cd3..ceabec5b22f 100644 --- a/ace/Get_Opt.cpp +++ b/ace/Get_Opt.cpp @@ -2,14 +2,15 @@ // $Id$ #include "ace/Get_Opt.h" -#include "ace/ACE.h" -#include "ace/Log_Msg.h" -#include "ace/SString.h" #if !defined (__ACE_INLINE__) #include "ace/Get_Opt.i" #endif /* __ACE_INLINE__ */ +#include "ace/ACE.h" +#include "ace/Log_Msg.h" +#include "ace/SString.h" + ACE_RCSID(ace, Get_Opt, "$Id$") /* diff --git a/ace/Global_Macros.h b/ace/Global_Macros.h index ae8380af3c3..bea349074a3 100644 --- a/ace/Global_Macros.h +++ b/ace/Global_Macros.h @@ -642,6 +642,88 @@ _make_##SERVICE_CLASS (ACE_Service_Object_Exterminator *gobbler) \ # define ACE_SVC_FACTORY_DEFINE(X) ACE_FACTORY_DEFINE (ACE_Svc, X) //@} +// Add some typedefs and macros to enhance Win32 conformance... +# if !defined (LPSECURITY_ATTRIBUTES) +# define LPSECURITY_ATTRIBUTES int +# endif /* !defined LPSECURITY_ATTRIBUTES */ +# if !defined (GENERIC_READ) +# define GENERIC_READ 0 +# endif /* !defined GENERIC_READ */ +# if !defined (FILE_SHARE_READ) +# define FILE_SHARE_READ 0 +# endif /* !defined FILE_SHARE_READ */ +# if !defined (OPEN_EXISTING) +# define OPEN_EXISTING 0 +# endif /* !defined OPEN_EXISTING */ +# if !defined (FILE_ATTRIBUTE_NORMAL) +# define FILE_ATTRIBUTE_NORMAL 0 +# endif /* !defined FILE_ATTRIBUTE_NORMAL */ +# if !defined (MAXIMUM_WAIT_OBJECTS) +# define MAXIMUM_WAIT_OBJECTS 0 +# endif /* !defined MAXIMUM_WAIT_OBJECTS */ +# if !defined (FILE_FLAG_OVERLAPPED) +# define FILE_FLAG_OVERLAPPED 0 +# endif /* !defined FILE_FLAG_OVERLAPPED */ +# if !defined (FILE_FLAG_SEQUENTIAL_SCAN) +# define FILE_FLAG_SEQUENTIAL_SCAN 0 +# endif /* FILE_FLAG_SEQUENTIAL_SCAN */ +# if !defined(FILE_FLAG_WRITE_THROUGH) +# define FILE_FLAG_WRITE_THROUGH 0 +# endif /* !defined FILE_FLAG_WRITE_THROUGH */ +# if !defined(PIPE_WAIT) +# define PIPE_WAIT 0 +# endif /* !defined PIPE_WAIT */ +# if !defined(PIPE_NOWAIT) +# define PIPE_NOWAIT 0 +# endif /* !defined PIPE_WAIT */ +# if !defined(PIPE_READMODE_BYTE) +# define PIPE_READMODE_BYTE 0 +# endif /* !defined PIPE_READMODE_BYTE */ +# if !defined(PIPE_READMODE_MESSAGE) +# define PIPE_READMODE_MESSAGE 0 +# endif /* !defined PIPE_READMODE_MESSAGE */ +# if !defined(PIPE_TYPE_BYTE) +# define PIPE_TYPE_BYTE 0 +# endif /* !defined PIPE_TYPE_BYTE */ +# if !defined(PIPE_TYPE_MESSAGE) +# define PIPE_TYPE_MESSAGE 0 +# endif /* !defined PIPE_TYPE_MESSAGE */ + +// Some useful abstrations for expressions involving +// ACE_Allocator.malloc (). The difference between ACE_NEW_MALLOC* +// with ACE_ALLOCATOR* is that they call constructors also. + +# define ACE_ALLOCATOR_RETURN(POINTER,ALLOCATOR,RET_VAL) \ + do { POINTER = ALLOCATOR; \ + if (POINTER == 0) { errno = ENOMEM; return RET_VAL; } \ + } while (0) +# define ACE_ALLOCATOR(POINTER,ALLOCATOR) \ + do { POINTER = ALLOCATOR; \ + if (POINTER == 0) { errno = ENOMEM; return; } \ + } while (0) +# define ACE_ALLOCATOR_NORETURN(POINTER,ALLOCATOR) \ + do { POINTER = ALLOCATOR; \ + if (POINTER == 0) { errno = ENOMEM; } \ + } while (0) + +# define ACE_NEW_MALLOC_RETURN(POINTER,ALLOCATOR,CONSTRUCTOR,RET_VAL) \ + do { POINTER = ALLOCATOR; \ + if (POINTER == 0) { errno = ENOMEM; return RET_VAL;} \ + else { new (POINTER) CONSTRUCTOR; } \ + } while (0) +# define ACE_NEW_MALLOC(POINTER,ALLOCATOR,CONSTRUCTOR) \ + do { POINTER = ALLOCATOR; \ + if (POINTER == 0) { errno = ENOMEM; return;} \ + else { new (POINTER) CONSTRUCTOR; } \ + } while (0) +# define ACE_NEW_MALLOC_NORETURN(POINTER,ALLOCATOR,CONSTRUCTOR) \ + do { POINTER = ALLOCATOR; \ + if (POINTER == 0) { errno = ENOMEM;} \ + else { new (POINTER) CONSTRUCTOR; } \ + } while (0) + +# define ACE_NOOP(x) + #include "ace/post.h" #endif /*ACE_GLOBAL_MACROS_H*/ diff --git a/ace/Handle_Ops.cpp b/ace/Handle_Ops.cpp index 4ef3f805016..80b58ec7e15 100644 --- a/ace/Handle_Ops.cpp +++ b/ace/Handle_Ops.cpp @@ -6,6 +6,8 @@ #include "ace/Handle_Ops.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#include "ace/OS.h" + ACE_RCSID(ace, Handle_Ops, "$Id$") ACE_HANDLE diff --git a/ace/Handle_Ops.h b/ace/Handle_Ops.h index 7368e090a73..b3bf2d92584 100644 --- a/ace/Handle_Ops.h +++ b/ace/Handle_Ops.h @@ -24,8 +24,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" +#include "ace/Global_Macros.h" +class ACE_Time_Value; class ACE_Export ACE_Handle_Ops { diff --git a/ace/Handle_Set.h b/ace/Handle_Set.h index 9bdcaa80e82..0b0c13ef63e 100644 --- a/ace/Handle_Set.h +++ b/ace/Handle_Set.h @@ -14,12 +14,15 @@ #define ACE_HANDLE_SET_H #include "ace/pre.h" -#include "ace/OS.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/os_include/sys/os_select.h" +#include "ace/os_include/os_limits.h" + #if (defined (ACE_PSOS) && !defined (ACE_PSOSIM)) || defined (__QNX__) typedef long fd_mask; #elif defined (ACE_WIN32) && defined (CHORUS) && !defined (CHORUS_4) diff --git a/ace/Lib_Find.h b/ace/Lib_Find.h index 3b5370ef252..cb912b51bbb 100644 --- a/ace/Lib_Find.h +++ b/ace/Lib_Find.h @@ -12,7 +12,8 @@ #define ACE_LIB_FIND_H #include "ace/pre.h" -#include "ace/OS.h" +#include "ace/config-all.h" +#include "ace/ACE_export.h" /** * @class ACE_Lib_Find diff --git a/ace/Makefile.ace b/ace/Makefile.ace index 631ef2cce89..8a3452dd3a7 100644 --- a/ace/Makefile.ace +++ b/ace/Makefile.ace @@ -36,6 +36,7 @@ UTILS_FILES = \ Containers \ Configuration \ Configuration_Import_Export \ + Date_Time \ Dirent \ Dirent_Selector \ Dynamic \ diff --git a/ace/Malloc_Allocator.h b/ace/Malloc_Allocator.h index ab3d4166039..a6a35fb9742 100644 --- a/ace/Malloc_Allocator.h +++ b/ace/Malloc_Allocator.h @@ -15,14 +15,13 @@ #include "ace/pre.h" -#include "ace/OS.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Malloc_Base.h" -#include "ace/Log_Msg.h" #if defined (ACE_HAS_MALLOC_STATS) #include "ace/Synch_T.h" diff --git a/ace/Malloc_Allocator.i b/ace/Malloc_Allocator.i index 55aba21992e..bd486e3f819 100644 --- a/ace/Malloc_Allocator.i +++ b/ace/Malloc_Allocator.i @@ -1,5 +1,14 @@ // $Id$ +#include "ace/os_include/os_errno.h" + +#if !defined (ACE_NDEBUG) +# include "ace/Log_Message.h" // for ACE_ASSERT +#else +# if !defined (ACE_ASSERT) +# define ACE_ASSERT(X) +# endif /* !ACE_ASSERT */ +#endif /* !ACE_NDEBUG */ ACE_INLINE void * ACE_New_Allocator::calloc (size_t n_elem, size_t elem_size, char initial_value) diff --git a/ace/Malloc_Base.h b/ace/Malloc_Base.h index 595f74cce2c..c074ab77d75 100644 --- a/ace/Malloc_Base.h +++ b/ace/Malloc_Base.h @@ -15,12 +15,15 @@ #define ACE_MALLOC_BASE_H #include "ace/pre.h" -#include "ace/OS.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/os_include/sys/os_types.h" +#include "ace/os_include/sys/os_mman.h" + // The definition of this class is located in Malloc.cpp. /** diff --git a/ace/Message_Block_T.cpp b/ace/Message_Block_T.cpp index da1aa495910..3afa8866abf 100644 --- a/ace/Message_Block_T.cpp +++ b/ace/Message_Block_T.cpp @@ -12,6 +12,8 @@ ACE_RCSID(ace, Message_Block_T, "$Id$") #include "ace/Message_Block_T.i" #endif /* __ACE_INLINE__ */ +#include "ace/os_include/os_errno.h" + template<class L> ACE_Locked_Data_Block<L>::~ACE_Locked_Data_Block (void) { @@ -1295,8 +1295,6 @@ static const ACE_UINT32 ACE_U_ONE_SECOND_IN_NSECS = 1000000000U; # include "ace/os_include/os_fcntl.h" -typedef OVERLAPPED ACE_OVERLAPPED; - typedef DWORD ACE_thread_t; typedef HANDLE ACE_hthread_t; @@ -1401,62 +1399,6 @@ protected: unsigned long waiting_threads_; }; -struct ACE_OVERLAPPED -{ - unsigned long Internal; - unsigned long InternalHigh; - unsigned long Offset; - unsigned long OffsetHigh; - ACE_HANDLE hEvent; -}; - - -// Add some typedefs and macros to enhance Win32 conformance... -# if !defined (LPSECURITY_ATTRIBUTES) -# define LPSECURITY_ATTRIBUTES int -# endif /* !defined LPSECURITY_ATTRIBUTES */ -# if !defined (GENERIC_READ) -# define GENERIC_READ 0 -# endif /* !defined GENERIC_READ */ -# if !defined (FILE_SHARE_READ) -# define FILE_SHARE_READ 0 -# endif /* !defined FILE_SHARE_READ */ -# if !defined (OPEN_EXISTING) -# define OPEN_EXISTING 0 -# endif /* !defined OPEN_EXISTING */ -# if !defined (FILE_ATTRIBUTE_NORMAL) -# define FILE_ATTRIBUTE_NORMAL 0 -# endif /* !defined FILE_ATTRIBUTE_NORMAL */ -# if !defined (MAXIMUM_WAIT_OBJECTS) -# define MAXIMUM_WAIT_OBJECTS 0 -# endif /* !defined MAXIMUM_WAIT_OBJECTS */ -# if !defined (FILE_FLAG_OVERLAPPED) -# define FILE_FLAG_OVERLAPPED 0 -# endif /* !defined FILE_FLAG_OVERLAPPED */ -# if !defined (FILE_FLAG_SEQUENTIAL_SCAN) -# define FILE_FLAG_SEQUENTIAL_SCAN 0 -# endif /* FILE_FLAG_SEQUENTIAL_SCAN */ -# if !defined(FILE_FLAG_WRITE_THROUGH) -# define FILE_FLAG_WRITE_THROUGH 0 -# endif /* !defined FILE_FLAG_WRITE_THROUGH */ -# if !defined(PIPE_WAIT) -# define PIPE_WAIT 0 -# endif /* !defined PIPE_WAIT */ -# if !defined(PIPE_NOWAIT) -# define PIPE_NOWAIT 0 -# endif /* !defined PIPE_WAIT */ -# if !defined(PIPE_READMODE_BYTE) -# define PIPE_READMODE_BYTE 0 -# endif /* !defined PIPE_READMODE_BYTE */ -# if !defined(PIPE_READMODE_MESSAGE) -# define PIPE_READMODE_MESSAGE 0 -# endif /* !defined PIPE_READMODE_MESSAGE */ -# if !defined(PIPE_TYPE_BYTE) -# define PIPE_TYPE_BYTE 0 -# endif /* !defined PIPE_TYPE_BYTE */ -# if !defined(PIPE_TYPE_MESSAGE) -# define PIPE_TYPE_MESSAGE 0 -# endif /* !defined PIPE_TYPE_MESSAGE */ # if defined (ACE_VXWORKS) && ACE_VXWORKS <= 0x540 // Work around a lack of ANSI prototypes for these functions on VxWorks. @@ -4456,41 +4398,6 @@ private: # define ACE_KEY_INDEX(OBJ,KEY) u_int OBJ = KEY # endif /* ACE_HAS_NONSCALAR_THREAD_KEY_T */ -// Some useful abstrations for expressions involving -// ACE_Allocator.malloc (). The difference between ACE_NEW_MALLOC* -// with ACE_ALLOCATOR* is that they call constructors also. - -# define ACE_ALLOCATOR_RETURN(POINTER,ALLOCATOR,RET_VAL) \ - do { POINTER = ALLOCATOR; \ - if (POINTER == 0) { errno = ENOMEM; return RET_VAL; } \ - } while (0) -# define ACE_ALLOCATOR(POINTER,ALLOCATOR) \ - do { POINTER = ALLOCATOR; \ - if (POINTER == 0) { errno = ENOMEM; return; } \ - } while (0) -# define ACE_ALLOCATOR_NORETURN(POINTER,ALLOCATOR) \ - do { POINTER = ALLOCATOR; \ - if (POINTER == 0) { errno = ENOMEM; } \ - } while (0) - -# define ACE_NEW_MALLOC_RETURN(POINTER,ALLOCATOR,CONSTRUCTOR,RET_VAL) \ - do { POINTER = ALLOCATOR; \ - if (POINTER == 0) { errno = ENOMEM; return RET_VAL;} \ - else { new (POINTER) CONSTRUCTOR; } \ - } while (0) -# define ACE_NEW_MALLOC(POINTER,ALLOCATOR,CONSTRUCTOR) \ - do { POINTER = ALLOCATOR; \ - if (POINTER == 0) { errno = ENOMEM; return;} \ - else { new (POINTER) CONSTRUCTOR; } \ - } while (0) -# define ACE_NEW_MALLOC_NORETURN(POINTER,ALLOCATOR,CONSTRUCTOR) \ - do { POINTER = ALLOCATOR; \ - if (POINTER == 0) { errno = ENOMEM;} \ - else { new (POINTER) CONSTRUCTOR; } \ - } while (0) - -# define ACE_NOOP(x) - # if defined (ACE_HAS_THR_C_FUNC) // This is necessary to work around nasty problems with MVS C++. extern "C" ACE_OS_Export void ace_mutex_lock_cleanup_adapter (void *args); @@ -4694,35 +4601,6 @@ ace_main_i # endif /* ACE_PSOSIM */ # endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ -# if defined (ACE_WIN32) && ! defined (ACE_HAS_WINCE) \ - && ! defined (ACE_HAS_PHARLAP) -typedef TRANSMIT_FILE_BUFFERS ACE_TRANSMIT_FILE_BUFFERS; -typedef LPTRANSMIT_FILE_BUFFERS ACE_LPTRANSMIT_FILE_BUFFERS; -typedef PTRANSMIT_FILE_BUFFERS ACE_PTRANSMIT_FILE_BUFFERS; - -# define ACE_INFINITE INFINITE -# define ACE_STATUS_TIMEOUT STATUS_TIMEOUT -# define ACE_WAIT_FAILED WAIT_FAILED -# define ACE_WAIT_TIMEOUT WAIT_TIMEOUT -# else /* ACE_WIN32 */ -struct ACE_TRANSMIT_FILE_BUFFERS -{ - void *Head; - size_t HeadLength; - void *Tail; - size_t TailLength; -}; -typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_PTRANSMIT_FILE_BUFFERS; -typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_LPTRANSMIT_FILE_BUFFERS; - -# if !defined (ACE_INFINITE) -# define ACE_INFINITE LONG_MAX -# endif /* ACE_INFINITE */ -# define ACE_STATUS_TIMEOUT LONG_MAX -# define ACE_WAIT_FAILED LONG_MAX -# define ACE_WAIT_TIMEOUT LONG_MAX -# endif /* ACE_WIN32 */ - # if !defined (ACE_HAS_MINIMAL_ACE_OS) # include "ace/Trace.h" # endif /* ! ACE_HAS_MINIMAL_ACE_OS */ @@ -4848,23 +4726,6 @@ typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_LPTRANSMIT_FILE_BUFFERS; */ // #define ACE_DISABLE_SWAP_ON_READ -// Defining POSIX4 real-time signal range. -#if defined(ACE_HAS_POSIX_REALTIME_SIGNALS) -#define ACE_SIGRTMIN SIGRTMIN -#define ACE_SIGRTMAX SIGRTMAX - -#else /* !ACE_HAS_POSIX_REALTIME_SIGNALS */ - -#ifndef ACE_SIGRTMIN -#define ACE_SIGRTMIN 0 -#endif /* ACE_SIGRTMIN */ - -#ifndef ACE_SIGRTMAX -#define ACE_SIGRTMAX 0 -#endif /* ACE_SIGRTMAX */ - -#endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ - # if defined (ACE_LACKS_SYS_NERR) extern ACE_OS_Export int sys_nerr; # endif /* ACE_LACKS_SYS_NERR */ diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp index 98d52adbf12..b215a3837e4 100644 --- a/ace/Parse_Node.cpp +++ b/ace/Parse_Node.cpp @@ -2,15 +2,15 @@ #if (ACE_USES_CLASSIC_SVC_CONF == 1) -#include "ace/Service_Config.h" -#include "ace/Service_Repository.h" -#include "ace/Service_Types.h" -#include "ace/Task.h" - #if !defined (__ACE_INLINE__) #include "ace/Parse_Node.i" #endif /* ____ */ +#include "ace/Service_Config.h" +#include "ace/Service_Repository.h" +#include "ace/Service_Types.h" +#include "ace/Task.h" +#include "ace/DLL.h" ACE_RCSID (ace, Parse_Node, diff --git a/ace/Process.h b/ace/Process.h index 54960e9e641..d62d4c0cddc 100644 --- a/ace/Process.h +++ b/ace/Process.h @@ -14,13 +14,14 @@ #define ACE_PROCESS_H #include "ace/pre.h" -#include "ace/OS.h" -#include "ace/Handle_Set.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Handle_Set.h" + /** * @class ACE_Process_Options * diff --git a/ace/Read_Buffer.h b/ace/Read_Buffer.h index f2d77add242..6a22d223c9f 100644 --- a/ace/Read_Buffer.h +++ b/ace/Read_Buffer.h @@ -22,7 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" +#include "ace/Global_Macros.h" +#include "ace/os_include/os_stdio.h" class ACE_Allocator; diff --git a/ace/Service_Object.h b/ace/Service_Object.h index 16cc48518da..1252abe4f8c 100644 --- a/ace/Service_Object.h +++ b/ace/Service_Object.h @@ -22,7 +22,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Event_Handler.h" -#include "ace/DLL.h" + +class ACE_DLL; #define ACE_Component ACE_Service_Object /** @@ -124,7 +125,7 @@ private: const ACE_Service_Type_Impl *type_; /// ACE_DLL representing the shared object file (non-zero if dynamically linked). - ACE_DLL dll_; + const ACE_DLL &dll_; /// 1 if svc is currently active, otherwise 0. int active_; diff --git a/ace/Sock_Connect.h b/ace/Sock_Connect.h index f1be1c2d2ef..af4e64d8a58 100644 --- a/ace/Sock_Connect.h +++ b/ace/Sock_Connect.h @@ -22,7 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" +#include "ace/Basic_Types.h" +#include "ace/os_include/netinet/os_in.h" // Forward Declarations class ACE_INET_Addr; diff --git a/ace/Thread_Control.h b/ace/Thread_Control.h index ed32db58184..372d96d5d35 100644 --- a/ace/Thread_Control.h +++ b/ace/Thread_Control.h @@ -14,7 +14,7 @@ #define ACE_THREAD_CONTROL_H #include "ace/pre.h" -#include "ace/config-all.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Thread_Exit.h b/ace/Thread_Exit.h index c47b4f7307d..72a8f45e6f8 100644 --- a/ace/Thread_Exit.h +++ b/ace/Thread_Exit.h @@ -20,7 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" #include "ace/Thread_Control.h" /** @@ -69,7 +68,7 @@ private: * See bug #526. * We don't follow the singleton pattern due to dependency issues. */ - static u_int is_constructed_; + static unsigned int is_constructed_; }; /** diff --git a/ace/Typed_SV_Message.h b/ace/Typed_SV_Message.h index e3973d78590..4e6e0be20bc 100644 --- a/ace/Typed_SV_Message.h +++ b/ace/Typed_SV_Message.h @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" - /** * @class ACE_Typed_SV_Message * diff --git a/ace/Unbounded_Queue.h b/ace/Unbounded_Queue.h index 0c110c896dc..eb72278f7b2 100644 --- a/ace/Unbounded_Queue.h +++ b/ace/Unbounded_Queue.h @@ -21,7 +21,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ // For size_t under Chorus -#include "ace/OS_Memory.h" +#include "ace/os_include/os_stddef.h" class ACE_Allocator; diff --git a/ace/os_include/os_pthread.h b/ace/os_include/os_pthread.h index 68b45c8f07b..d982089d518 100644 --- a/ace/os_include/os_pthread.h +++ b/ace/os_include/os_pthread.h @@ -347,6 +347,9 @@ extern "C" pthread_t pthread_self (void); # if !defined (ACE_HAS_STHREADS) # if !defined (ACE_HAS_POSIX_SEM) + +// This needs to be moved out of here. +#include "ace/OS_Export.h" /** * @class ACE_sema_t * diff --git a/ace/os_include/os_signal.h b/ace/os_include/os_signal.h index 4114ce288f0..97f3aad4596 100644 --- a/ace/os_include/os_signal.h +++ b/ace/os_include/os_signal.h @@ -243,6 +243,23 @@ extern "C" }; #endif /* ACE_LACKS_SIGACTION */ +// Defining POSIX4 real-time signal range. +#if defined(ACE_HAS_POSIX_REALTIME_SIGNALS) +#define ACE_SIGRTMIN SIGRTMIN +#define ACE_SIGRTMAX SIGRTMAX + +#else /* !ACE_HAS_POSIX_REALTIME_SIGNALS */ + +#ifndef ACE_SIGRTMIN +#define ACE_SIGRTMIN 0 +#endif /* ACE_SIGRTMIN */ + +#ifndef ACE_SIGRTMAX +#define ACE_SIGRTMAX 0 +#endif /* ACE_SIGRTMAX */ + +#endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ace/os_include/os_stdio.h b/ace/os_include/os_stdio.h index 3423b658255..31633db80e7 100644 --- a/ace/os_include/os_stdio.h +++ b/ace/os_include/os_stdio.h @@ -94,6 +94,19 @@ extern "C" int fileno(FILE *); #endif /* ACE_PSOS_SNARFS_HEADER_INFO */ +#if defined (ACE_WIN32) + typedef OVERLAPPED ACE_OVERLAPPED; +#else + struct ACE_OVERLAPPED + { + unsigned long Internal; + unsigned long InternalHigh; + unsigned long Offset; + unsigned long OffsetHigh; + ACE_HANDLE hEvent; + }; +#endif /* ACE_WIN32 */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp b/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp index d983556b2b6..9186e5f6d1e 100644 --- a/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp +++ b/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/FIFO_Send_Msg.h" +#include "ace/OS.h" ACE_RCSID(FIFO_SAP, FIFO_Msg_client, "$Id$") @@ -29,7 +30,7 @@ ACE_TMAIN (int, ACE_TCHAR *[]) return 0; } #else -#include <stdio.h> +#include "ace/os_include/os_stdio.h" int ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_OS::fprintf (stderr, "This feature is not supported\n"); diff --git a/tests/CDR_File_Test.cpp b/tests/CDR_File_Test.cpp index 3097f4f4903..01c152a8eaa 100644 --- a/tests/CDR_File_Test.cpp +++ b/tests/CDR_File_Test.cpp @@ -23,6 +23,7 @@ #include "ace/Auto_Ptr.h" #include "ace/Get_Opt.h" #include "test_config.h" +#include "ace/ACE.h" ACE_RCSID(tests, CDR_File_Test, "$Id$") diff --git a/websvcs/lib/URL_Addr.i b/websvcs/lib/URL_Addr.i index 5e4f83453f7..89ca74d8b7a 100644 --- a/websvcs/lib/URL_Addr.i +++ b/websvcs/lib/URL_Addr.i @@ -2,6 +2,8 @@ // **************************************************************** +#include "ace/OS.h" + ACE_INLINE ACE_URL_Addr::ACE_URL_Addr (const ACE_URL_Addr& address) : ACE_Addr (), |