diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-05-02 04:08:14 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-05-02 04:08:14 +0000 |
| commit | 79ac8ef5e83c63ee47f4a542a81598eb6be91fda (patch) | |
| tree | 2f6d35d010baf75e4704bff8006965a36749aa9c | |
| parent | 8f69e97f4dd195efee5e4c9212e0baf9a5fcb581 (diff) | |
| download | ATCD-79ac8ef5e83c63ee47f4a542a81598eb6be91fda.tar.gz | |
ChangeLogTag:Wed May 1 21:07:23 2002 Ossama Othman <ossama@uci.edu>
70 files changed, 882 insertions, 303 deletions
diff --git a/ChangeLog b/ChangeLog index cfc2d0dd423..8d5524ee35f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,151 @@ +Wed May 1 21:07:23 2002 Ossama Othman <ossama@uci.edu> + + * ace/config-win32-msvc-6.h: + + Moved library "decorator" related macros to + config-win32-msvc.h. + + * ace/config-win32-msvc.h: + + Support "decorated" library names for MSVC 6 or better. Fixes + run-time library search problems in MS Visual Studio .NET + builds. + + * ace/ATM_Addr.h: + * ace/ATM_Params.h: + * ace/MEM_Addr.h: + * ace/Module.h: + * ace/Name_Space.h: + * ace/Naming_Context.h: + * ace/Remote_Name_Space.h: + + Include "ACE_export.h" instead of "ACE.h." The latter is + overkill. + + * ace/PI_Malloc.h: + + Include "ACE_export.h" instead of "ACE.h." The latter is + overkill. + + No need to include "ace/Malloc_T.h" and "ace/Memory_Pool.h" + + * ace/Date_Time.h: + * ace/Event_Handler.h: + * ace/High_Res_Timer.h: + * ace/Malloc.h: + * ace/Malloc_Allocator.h: + * ace/Malloc_T.h: + * ace/Mem_Map.h: + * ace/Pipe.h: + * ace/Profile_Timer.h: + * ace/Read_Buffer.h: + * ace/Shared_Memory.h: + * ace/Shared_Object.h: + * ace/SOCK.h: + * ace/SPIPE_Addr.h: + * ace/Stats.h: + * ace/SV_Message.h: + * ace/SV_Semaphore_Simple.h: + * ace/SV_Shared_Memory.h: + * ace/Synch.h: + * ace/Synch_Options.h: + * ace/Thread.h: + * ace/Typed_SV_Message.h: + + Include "OS.h" and "ACE_export.h" instead of "ACE.h." The + latter is overkill. + + * ace/Configuration.h: + * ace/DEV_Addr.h: + * ace/FIFO.h: + * ace/Get_Opt.h: + * ace/Vector_T.h: + + No need to include "ACE.h." + + * ace/Dynamic.h: + + No need to include "ACE.h", "Synch_T.h" and "Singleton.h." + "ACE_export.h" is enough. + + * ace/INET_Addr.h: + + Include "Sock_Connect.h" instead of "ACE.h". The latter is + overkill. + + * ace/Message_Block.h: + + Include "ace/OS.h" and "ace/ACE_export.h" instead "ace/ACE.h". + The latter is overkill. + + No need to include "Malloc.h" + + * ace/IO_Cntl_Msg.h: + * ace/Sock_Connect.h: + + Include "ACE_export.h" to pull in ACE_Export macro definition. + + * ace/Activation_Queue.cpp: + * ace/Message_Block.cpp: + + Include "ace/Malloc_Base.h" to pull in ACE_Allocator class + declaration. + + * ace/DEV_IO.h: + * ace/FIFO_Recv.h: + * ace/FIFO_Send.h: + * ace/NT_Service.h: + * ace/SOCK_Dgram.cpp: + * ace/SOCK_Dgram_Mcast.cpp: + * ace/SOCK_IO.h: + * ace/SPIPE_Stream.h: + * ace/SV_Semaphore_Simple.cpp: + * ace/Service_Types.h: + * tests/test_config.h: + + Include "ace/ACE.h" pull in methods in the "ACE" + class/namespace. + + * ace/Stream.h: + * ace/SV_Message_Queue.h: + + Include "config-all.h" instead of "ACE.h." The latter is + overkill. + + * ace/OS_Memory.h: + * ace/config-all.h: + + Moved default definition of the + ACE_HAS_POSITION_INDEPENDENT_POINTERS macro to + "ace/config-all.h". Allows for additional reductions in + inter-header dependencies. + + * ace/PI_Malloc.cpp: + + Moved non-essential includes within the + "ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1" block. No need to + include them if the implementation won't be compiled. + + * ace/Select_Reactor_T.cpp: + + Include "ace/ACE.h" pull in methods in the "ACE" + class/namespace. + + (handle_events): + + Moved ACE_Countdown_Time declaration within the ACE_MT_SAFE + block. It is only used for the multi-threaded case. + + (work_pending): + + As part of the timeout take into account the time taken to + acquire the lock. + + Copy the timeout value. Do not ignore the interface by casting + away the const-ness. + + Do not bother continuing if the reactor has been deactivated. + Wed May 1 15:49:33 2002 Steve Huston <shuston@riverace.com> * tests/DLL_Test_Impl.{h cpp}: Add a nothrow variant of operator new @@ -1999,7 +2147,6 @@ Mon Apr 1 18:27:46 2002 Steve Huston <shuston@riverace.com> * ace/OS_String.inl (strtok_r): Corrected decision to call wcstok() or wcstok_r(). This fixes builds on HP-UX 11. - Mon Apr 1 16:35:29 2002 Steve Huston <shuston@riverace.com> * ace/Containers_T.h (ACE_Array): Added performance characteristics diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index cfc2d0dd423..8d5524ee35f 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,151 @@ +Wed May 1 21:07:23 2002 Ossama Othman <ossama@uci.edu> + + * ace/config-win32-msvc-6.h: + + Moved library "decorator" related macros to + config-win32-msvc.h. + + * ace/config-win32-msvc.h: + + Support "decorated" library names for MSVC 6 or better. Fixes + run-time library search problems in MS Visual Studio .NET + builds. + + * ace/ATM_Addr.h: + * ace/ATM_Params.h: + * ace/MEM_Addr.h: + * ace/Module.h: + * ace/Name_Space.h: + * ace/Naming_Context.h: + * ace/Remote_Name_Space.h: + + Include "ACE_export.h" instead of "ACE.h." The latter is + overkill. + + * ace/PI_Malloc.h: + + Include "ACE_export.h" instead of "ACE.h." The latter is + overkill. + + No need to include "ace/Malloc_T.h" and "ace/Memory_Pool.h" + + * ace/Date_Time.h: + * ace/Event_Handler.h: + * ace/High_Res_Timer.h: + * ace/Malloc.h: + * ace/Malloc_Allocator.h: + * ace/Malloc_T.h: + * ace/Mem_Map.h: + * ace/Pipe.h: + * ace/Profile_Timer.h: + * ace/Read_Buffer.h: + * ace/Shared_Memory.h: + * ace/Shared_Object.h: + * ace/SOCK.h: + * ace/SPIPE_Addr.h: + * ace/Stats.h: + * ace/SV_Message.h: + * ace/SV_Semaphore_Simple.h: + * ace/SV_Shared_Memory.h: + * ace/Synch.h: + * ace/Synch_Options.h: + * ace/Thread.h: + * ace/Typed_SV_Message.h: + + Include "OS.h" and "ACE_export.h" instead of "ACE.h." The + latter is overkill. + + * ace/Configuration.h: + * ace/DEV_Addr.h: + * ace/FIFO.h: + * ace/Get_Opt.h: + * ace/Vector_T.h: + + No need to include "ACE.h." + + * ace/Dynamic.h: + + No need to include "ACE.h", "Synch_T.h" and "Singleton.h." + "ACE_export.h" is enough. + + * ace/INET_Addr.h: + + Include "Sock_Connect.h" instead of "ACE.h". The latter is + overkill. + + * ace/Message_Block.h: + + Include "ace/OS.h" and "ace/ACE_export.h" instead "ace/ACE.h". + The latter is overkill. + + No need to include "Malloc.h" + + * ace/IO_Cntl_Msg.h: + * ace/Sock_Connect.h: + + Include "ACE_export.h" to pull in ACE_Export macro definition. + + * ace/Activation_Queue.cpp: + * ace/Message_Block.cpp: + + Include "ace/Malloc_Base.h" to pull in ACE_Allocator class + declaration. + + * ace/DEV_IO.h: + * ace/FIFO_Recv.h: + * ace/FIFO_Send.h: + * ace/NT_Service.h: + * ace/SOCK_Dgram.cpp: + * ace/SOCK_Dgram_Mcast.cpp: + * ace/SOCK_IO.h: + * ace/SPIPE_Stream.h: + * ace/SV_Semaphore_Simple.cpp: + * ace/Service_Types.h: + * tests/test_config.h: + + Include "ace/ACE.h" pull in methods in the "ACE" + class/namespace. + + * ace/Stream.h: + * ace/SV_Message_Queue.h: + + Include "config-all.h" instead of "ACE.h." The latter is + overkill. + + * ace/OS_Memory.h: + * ace/config-all.h: + + Moved default definition of the + ACE_HAS_POSITION_INDEPENDENT_POINTERS macro to + "ace/config-all.h". Allows for additional reductions in + inter-header dependencies. + + * ace/PI_Malloc.cpp: + + Moved non-essential includes within the + "ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1" block. No need to + include them if the implementation won't be compiled. + + * ace/Select_Reactor_T.cpp: + + Include "ace/ACE.h" pull in methods in the "ACE" + class/namespace. + + (handle_events): + + Moved ACE_Countdown_Time declaration within the ACE_MT_SAFE + block. It is only used for the multi-threaded case. + + (work_pending): + + As part of the timeout take into account the time taken to + acquire the lock. + + Copy the timeout value. Do not ignore the interface by casting + away the const-ness. + + Do not bother continuing if the reactor has been deactivated. + Wed May 1 15:49:33 2002 Steve Huston <shuston@riverace.com> * tests/DLL_Test_Impl.{h cpp}: Add a nothrow variant of operator new @@ -1999,7 +2147,6 @@ Mon Apr 1 18:27:46 2002 Steve Huston <shuston@riverace.com> * ace/OS_String.inl (strtok_r): Corrected decision to call wcstok() or wcstok_r(). This fixes builds on HP-UX 11. - Mon Apr 1 16:35:29 2002 Steve Huston <shuston@riverace.com> * ace/Containers_T.h (ACE_Array): Added performance characteristics diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index cfc2d0dd423..8d5524ee35f 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,151 @@ +Wed May 1 21:07:23 2002 Ossama Othman <ossama@uci.edu> + + * ace/config-win32-msvc-6.h: + + Moved library "decorator" related macros to + config-win32-msvc.h. + + * ace/config-win32-msvc.h: + + Support "decorated" library names for MSVC 6 or better. Fixes + run-time library search problems in MS Visual Studio .NET + builds. + + * ace/ATM_Addr.h: + * ace/ATM_Params.h: + * ace/MEM_Addr.h: + * ace/Module.h: + * ace/Name_Space.h: + * ace/Naming_Context.h: + * ace/Remote_Name_Space.h: + + Include "ACE_export.h" instead of "ACE.h." The latter is + overkill. + + * ace/PI_Malloc.h: + + Include "ACE_export.h" instead of "ACE.h." The latter is + overkill. + + No need to include "ace/Malloc_T.h" and "ace/Memory_Pool.h" + + * ace/Date_Time.h: + * ace/Event_Handler.h: + * ace/High_Res_Timer.h: + * ace/Malloc.h: + * ace/Malloc_Allocator.h: + * ace/Malloc_T.h: + * ace/Mem_Map.h: + * ace/Pipe.h: + * ace/Profile_Timer.h: + * ace/Read_Buffer.h: + * ace/Shared_Memory.h: + * ace/Shared_Object.h: + * ace/SOCK.h: + * ace/SPIPE_Addr.h: + * ace/Stats.h: + * ace/SV_Message.h: + * ace/SV_Semaphore_Simple.h: + * ace/SV_Shared_Memory.h: + * ace/Synch.h: + * ace/Synch_Options.h: + * ace/Thread.h: + * ace/Typed_SV_Message.h: + + Include "OS.h" and "ACE_export.h" instead of "ACE.h." The + latter is overkill. + + * ace/Configuration.h: + * ace/DEV_Addr.h: + * ace/FIFO.h: + * ace/Get_Opt.h: + * ace/Vector_T.h: + + No need to include "ACE.h." + + * ace/Dynamic.h: + + No need to include "ACE.h", "Synch_T.h" and "Singleton.h." + "ACE_export.h" is enough. + + * ace/INET_Addr.h: + + Include "Sock_Connect.h" instead of "ACE.h". The latter is + overkill. + + * ace/Message_Block.h: + + Include "ace/OS.h" and "ace/ACE_export.h" instead "ace/ACE.h". + The latter is overkill. + + No need to include "Malloc.h" + + * ace/IO_Cntl_Msg.h: + * ace/Sock_Connect.h: + + Include "ACE_export.h" to pull in ACE_Export macro definition. + + * ace/Activation_Queue.cpp: + * ace/Message_Block.cpp: + + Include "ace/Malloc_Base.h" to pull in ACE_Allocator class + declaration. + + * ace/DEV_IO.h: + * ace/FIFO_Recv.h: + * ace/FIFO_Send.h: + * ace/NT_Service.h: + * ace/SOCK_Dgram.cpp: + * ace/SOCK_Dgram_Mcast.cpp: + * ace/SOCK_IO.h: + * ace/SPIPE_Stream.h: + * ace/SV_Semaphore_Simple.cpp: + * ace/Service_Types.h: + * tests/test_config.h: + + Include "ace/ACE.h" pull in methods in the "ACE" + class/namespace. + + * ace/Stream.h: + * ace/SV_Message_Queue.h: + + Include "config-all.h" instead of "ACE.h." The latter is + overkill. + + * ace/OS_Memory.h: + * ace/config-all.h: + + Moved default definition of the + ACE_HAS_POSITION_INDEPENDENT_POINTERS macro to + "ace/config-all.h". Allows for additional reductions in + inter-header dependencies. + + * ace/PI_Malloc.cpp: + + Moved non-essential includes within the + "ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1" block. No need to + include them if the implementation won't be compiled. + + * ace/Select_Reactor_T.cpp: + + Include "ace/ACE.h" pull in methods in the "ACE" + class/namespace. + + (handle_events): + + Moved ACE_Countdown_Time declaration within the ACE_MT_SAFE + block. It is only used for the multi-threaded case. + + (work_pending): + + As part of the timeout take into account the time taken to + acquire the lock. + + Copy the timeout value. Do not ignore the interface by casting + away the const-ness. + + Do not bother continuing if the reactor has been deactivated. + Wed May 1 15:49:33 2002 Steve Huston <shuston@riverace.com> * tests/DLL_Test_Impl.{h cpp}: Add a nothrow variant of operator new @@ -1999,7 +2147,6 @@ Mon Apr 1 18:27:46 2002 Steve Huston <shuston@riverace.com> * ace/OS_String.inl (strtok_r): Corrected decision to call wcstok() or wcstok_r(). This fixes builds on HP-UX 11. - Mon Apr 1 16:35:29 2002 Steve Huston <shuston@riverace.com> * ace/Containers_T.h (ACE_Array): Added performance characteristics diff --git a/ace/ARGV.h b/ace/ARGV.h index 613af430fed..eb15a3da12e 100644 --- a/ace/ARGV.h +++ b/ace/ARGV.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file ARGV.h * @@ -9,18 +9,19 @@ * @author Doug Schmidt <schmidt@cs.wustl.edu> * @author Everett Anderson */ -//============================================================================= +//========================================================================== #ifndef ACE_ARGUMENT_VECTOR_H #define ACE_ARGUMENT_VECTOR_H #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS.h" #include "ace/Unbounded_Queue.h" /** diff --git a/ace/ATM_Addr.h b/ace/ATM_Addr.h index 69c1f6e27f8..47711e2e767 100644 --- a/ace/ATM_Addr.h +++ b/ace/ATM_Addr.h @@ -1,4 +1,6 @@ -//============================================================================= +// -*- C++ -*- + +//========================================================================== /** * @file ATM_Addr.h * @@ -6,7 +8,7 @@ * * @author Joe Hoffert <joeh@cs.wustl.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_ATM_ADDR_H #define ACE_ATM_ADDR_H @@ -20,7 +22,7 @@ #if defined (ACE_HAS_ATM) -#include "ace/ACE.h" +#include "ace/ACE_export.h" #include "ace/Addr.h" #if defined (ACE_HAS_FORE_ATM_XTI) diff --git a/ace/ATM_Params.h b/ace/ATM_Params.h index 59e8858ab22..dd2cbbe3c29 100644 --- a/ace/ATM_Params.h +++ b/ace/ATM_Params.h @@ -1,5 +1,6 @@ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file ATM_Params.h * @@ -7,7 +8,7 @@ * * @author Joe Hoffert <joeh@cs.wustl.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_ATM_PARAMS_H @@ -22,7 +23,7 @@ #if defined (ACE_HAS_ATM) -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if defined (ACE_HAS_FORE_ATM_XTI) #include "ace/TLI.h" diff --git a/ace/ATM_QoS.h b/ace/ATM_QoS.h index 586f9cd4146..9f5d1080e49 100644 --- a/ace/ATM_QoS.h +++ b/ace/ATM_QoS.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file ATM_QoS.h * @@ -8,7 +8,7 @@ * * @author Joe Hoffert */ -//============================================================================= +//========================================================================== #ifndef ACE_ATM_QoS_H @@ -23,8 +23,6 @@ #if defined (ACE_HAS_ATM) -#include "ace/ACE.h" - #if defined (ACE_HAS_FORE_ATM_WS2) // just map to WS2 GQOS struct typedef ACE_QoS ATM_QoS; diff --git a/ace/Activation_Queue.cpp b/ace/Activation_Queue.cpp index 9d5b0bca11e..b1a523082a8 100644 --- a/ace/Activation_Queue.cpp +++ b/ace/Activation_Queue.cpp @@ -1,14 +1,15 @@ -// $Id$ - #include "ace/Activation_Queue.h" #if !defined (__ACE_INLINE__) #include "ace/Activation_Queue.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, Activation_Queue, "$Id$") +#include "ace/Malloc_Base.h" + +ACE_RCSID (ace, + Activation_Queue, + "$Id$") -// Dump the state of an object. void ACE_Activation_Queue::dump (void) const diff --git a/ace/Configuration.h b/ace/Configuration.h index 6ec9cec606e..c404add645b 100644 --- a/ace/Configuration.h +++ b/ace/Configuration.h @@ -31,7 +31,6 @@ #define ACE_CONFIGURATION_H #include "ace/pre.h" -#include "ace/ACE.h" #include "ace/SString.h" #include "ace/Hash_Map_With_Allocator_T.h" #include "ace/Malloc.h" diff --git a/ace/DEV_Addr.h b/ace/DEV_Addr.h index a270004ea31..a549fb74b6d 100644 --- a/ace/DEV_Addr.h +++ b/ace/DEV_Addr.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file DEV_Addr.h * @@ -8,11 +8,12 @@ * * @author Gerhard Lenzer and Douglas C. Schmidt */ -//============================================================================= +//========================================================================== #ifndef ACE_DEV_ADDR_H #define ACE_DEV_ADDR_H + #include "ace/pre.h" #include "ace/Addr.h" @@ -21,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/ACE.h" +#include "ace/OS.h" /** * @class ACE_DEV_Addr @@ -81,4 +82,5 @@ private: #endif /* __ACE_INLINE__ */ #include "ace/post.h" + #endif /* ACE_DEV_ADDR_H */ diff --git a/ace/DEV_IO.h b/ace/DEV_IO.h index 64bc8a25984..5c262ba61ec 100644 --- a/ace/DEV_IO.h +++ b/ace/DEV_IO.h @@ -22,6 +22,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/ACE.h" + + /** * @class ACE_DEV_IO * diff --git a/ace/DLL.cpp b/ace/DLL.cpp index 5711e0b74e1..fe57c4067f0 100644 --- a/ace/DLL.cpp +++ b/ace/DLL.cpp @@ -73,6 +73,7 @@ ACE_DLL::open (const ACE_TCHAR *dll_filename, int result = ACE_Lib_Find::ldfind (dll_filename, dll_pathname, (sizeof dll_pathname / sizeof (ACE_TCHAR))); + // Check for errors if (result != 0) return result; diff --git a/ace/Date_Time.h b/ace/Date_Time.h index 14b37f76c6d..8e106742197 100644 --- a/ace/Date_Time.h +++ b/ace/Date_Time.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Date_Time.h * @@ -9,18 +9,20 @@ * @author Tim Harrison (harrison@cs.wustl.edu) (and he's darn proud of this ;-)) * */ -//============================================================================= +//========================================================================== #ifndef ACE_DATE_TIME_H #define ACE_DATE_TIME_H #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS.h" + /** * @class ACE_Date_Time * diff --git a/ace/Dynamic.h b/ace/Dynamic.h index ad8db6f7615..6c248b4f5a9 100644 --- a/ace/Dynamic.h +++ b/ace/Dynamic.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Dynamic.h * @@ -9,21 +9,18 @@ * @author Doug Schmidt * @author Irfan Pyarali. */ -//============================================================================= +//========================================================================== #ifndef ACE_DYNAMIC_H #define ACE_DYNAMIC_H #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Synch_T.h" -#include "ace/Singleton.h" - /** * @class ACE_Dynamic * diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h index 617be4ec849..87cf8aa37c7 100644 --- a/ace/Event_Handler.h +++ b/ace/Event_Handler.h @@ -1,6 +1,6 @@ /* -*- C++ -*- */ -//============================================================================= +//========================================================================== /** * @file Event_Handler.h * @@ -8,18 +8,20 @@ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_EVENT_HANDLER_H #define ACE_EVENT_HANDLER_H #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS.h" + // Forward declaration. class ACE_Message_Block; class ACE_Reactor; diff --git a/ace/FIFO.h b/ace/FIFO.h index bd8ea10d2f2..fd94e7026bc 100644 --- a/ace/FIFO.h +++ b/ace/FIFO.h @@ -1,6 +1,6 @@ /* -*- C++ -*- */ -//============================================================================= +//========================================================================== /** * @file FIFO.h * @@ -8,7 +8,7 @@ * * @author Doug Schmidt */ -//============================================================================= +//========================================================================== #ifndef ACE_FIFO_H @@ -16,7 +16,6 @@ #include "ace/pre.h" #include "ace/IPC_SAP.h" -#include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/FIFO_Recv.h b/ace/FIFO_Recv.h index 6767cf4ab7b..e0c9766cd46 100644 --- a/ace/FIFO_Recv.h +++ b/ace/FIFO_Recv.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file FIFO_Recv.h * @@ -8,11 +8,12 @@ * * @author Doug Schmidt */ -//============================================================================= +//========================================================================== #ifndef ACE_FIFO_RECV_H #define ACE_FIFO_RECV_H + #include "ace/pre.h" #include "ace/FIFO.h" @@ -21,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/ACE.h" + /** * @class ACE_FIFO_Recv * @@ -73,4 +76,5 @@ private: #endif #include "ace/post.h" + #endif /* ACE_FIFO_RECV_H */ diff --git a/ace/FIFO_Send.h b/ace/FIFO_Send.h index 7c870454b82..3f553deb88b 100644 --- a/ace/FIFO_Send.h +++ b/ace/FIFO_Send.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file FIFO_Send.h * @@ -8,11 +8,12 @@ * * @author Doug Schmidt */ -//============================================================================= +//========================================================================== #ifndef ACE_FIFO_SEND_H #define ACE_FIFO_SEND_H + #include "ace/pre.h" #include "ace/FIFO.h" @@ -21,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/ACE.h" + /** * @class ACE_FIFO_Send * @@ -63,4 +66,5 @@ public: #endif #include "ace/post.h" + #endif /* ACE_FIFO_SEND_H */ diff --git a/ace/Functor.h b/ace/Functor.h index 87be522579a..c04e28f76f1 100644 --- a/ace/Functor.h +++ b/ace/Functor.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Functor.h * @@ -25,7 +25,7 @@ * @author and on STL-style functor implementations originally done by * @author Irfan Pyarali <irfan@cs.wustl.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_FUNCTOR_H diff --git a/ace/Get_Opt.h b/ace/Get_Opt.h index b83f6f36d68..ff36c3acdcf 100644 --- a/ace/Get_Opt.h +++ b/ace/Get_Opt.h @@ -1,5 +1,6 @@ -/* -*- C++ -*- */ -//============================================================================= +// -*- C++ -*- + +//========================================================================== /** * @file Get_Opt.h * @@ -8,13 +9,12 @@ * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> * @author Don Hinton <dhinton@gmx.net> (added long option support) */ -//============================================================================= +//========================================================================== #ifndef ACE_GET_OPT_H #define ACE_GET_OPT_H #include "ace/pre.h" -#include "ace/ACE.h" #include "ace/SString.h" #include "ace/Containers.h" diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h index 5fa74fa430f..4df0617ff27 100644 --- a/ace/High_Res_Timer.h +++ b/ace/High_Res_Timer.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file High_Res_Timer.h * @@ -8,18 +8,20 @@ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_HIGH_RES_TIMER_H #define ACE_HIGH_RES_TIMER_H #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS.h" + /** * @class ACE_High_Res_Timer * diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h index 3cee7b8ac94..262402a07a3 100644 --- a/ace/INET_Addr.h +++ b/ace/INET_Addr.h @@ -14,7 +14,7 @@ #define ACE_INET_ADDR_H #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/Sock_Connect.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/IO_Cntl_Msg.h b/ace/IO_Cntl_Msg.h index 549becfa70d..d641de462af 100644 --- a/ace/IO_Cntl_Msg.h +++ b/ace/IO_Cntl_Msg.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file IO_Cntl_Msg.h * @@ -8,13 +8,21 @@ * * @author Doug Schmidt */ -//============================================================================= +//========================================================================== #ifndef ACE_IO_CNTL_MSG_H #define ACE_IO_CNTL_MSG_H + #include "ace/pre.h" +#include "ace/ACE_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + + /** * @class ACE_IO_Cntl_Msg * @@ -92,4 +100,5 @@ private: }; #include "ace/post.h" + #endif /* ACE_IO_CNTL_MSG_H */ diff --git a/ace/Intrusive_List_Node.h b/ace/Intrusive_List_Node.h index b376b3f97d2..5dedea4d271 100644 --- a/ace/Intrusive_List_Node.h +++ b/ace/Intrusive_List_Node.h @@ -27,7 +27,7 @@ * * The class should be used as follows: * - * class My_Object : public ACE_Intrusive_List_Node_Node<My_Object> {<BR> + * class My_Object : public ACE_Intrusive_List_Node<My_Object> {<BR> * ....<BR> * };<BR> * diff --git a/ace/Lib_Find.cpp b/ace/Lib_Find.cpp index 32a8ab6fb78..be75e3f8622 100644 --- a/ace/Lib_Find.cpp +++ b/ace/Lib_Find.cpp @@ -16,7 +16,7 @@ ACE_Lib_Find::ldfind (const ACE_TCHAR filename[], #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && \ !defined (ACE_HAS_PHARLAP) - ACE_TCHAR expanded_filename[MAXPATHLEN]; + ACE_TCHAR expanded_filename[MAXPATHLEN + 1] = { 0 }; if (ACE_TEXT_ExpandEnvironmentStrings (filename, expanded_filename, sizeof expanded_filename @@ -28,14 +28,19 @@ ACE_Lib_Find::ldfind (const ACE_TCHAR filename[], ACE_TCHAR searchpathname[MAXPATHLEN + 1]; #if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) ACE_TCHAR decorator[] = ACE_LD_DECORATOR_STR; - ACE_TCHAR searchfilename[MAXPATHLEN + sizeof(decorator) / sizeof (ACE_TCHAR)]; + ACE_TCHAR searchfilename[MAXPATHLEN + sizeof(decorator) / sizeof (ACE_TCHAR) + 1]; + + ACE_DEBUG ((LM_DEBUG, + ACE_LIB_TEXT ("************** <%s>:<%s>\n"), + decorator, + searchfilename)); + #else ACE_TCHAR searchfilename[MAXPATHLEN + 1]; #endif /* ACE_WIN32 && ACE_LD_DECORATOR_STR && !ACE_DISABLE_DEBUG_DLL_CHECK */ // Create a copy of filename to work with. - if (ACE_OS::strlen (filename) + 1 - > (sizeof tempcopy / sizeof (ACE_TCHAR))) + if (ACE_OS::strlen (filename) + 1 > (sizeof tempcopy / sizeof (ACE_TCHAR))) { errno = ENOMEM; return -1; diff --git a/ace/MEM_Addr.h b/ace/MEM_Addr.h index d13aa45479c..a2ae58d08ff 100644 --- a/ace/MEM_Addr.h +++ b/ace/MEM_Addr.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file MEM_Addr.h * @@ -8,14 +8,14 @@ * * @author Nanbor Wang <nanbor@cs.wustl.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_MEM_ADDR_H #define ACE_MEM_ADDR_H #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Malloc.h b/ace/Malloc.h index d2dee7818c8..e5272f66774 100644 --- a/ace/Malloc.h +++ b/ace/Malloc.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Malloc.h * @@ -8,18 +8,20 @@ * * @author Doug Schmidt and Irfan Pyarali */ -//============================================================================= +//========================================================================== #ifndef ACE_MALLOC_H #define ACE_MALLOC_H + #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS.h" #include "ace/Log_Msg.h" #if defined (ACE_HAS_MALLOC_STATS) @@ -411,4 +413,5 @@ public: #include "ace/Memory_Pool.h" #include "ace/post.h" + #endif /* ACE_MALLOC_H */ diff --git a/ace/Malloc_Allocator.h b/ace/Malloc_Allocator.h index b932adb74f4..6c2e20f8a89 100644 --- a/ace/Malloc_Allocator.h +++ b/ace/Malloc_Allocator.h @@ -1,20 +1,22 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Malloc_Allocator.h * * $Id$ * * @author Priyanka Gontla <pgontla@ece.uci.edu> + * @author Based on code that formerly existed in another ACE file. */ -//============================================================================= +//========================================================================== + +#ifndef ACE_MALLOC_ALLOCATOR_H +#define ACE_MALLOC_ALLOCATOR_H -#ifndef MALLOC_ALLOCATOR_H -#define MALLOC_ALLOCATOR_H #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -158,4 +160,5 @@ protected: #endif /* __ACE_INLINE__ */ #include "ace/post.h" + #endif /* MALLOC_ALLOCATOR_H */ diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h index a04a5434db1..bb6839342fd 100644 --- a/ace/Malloc_T.h +++ b/ace/Malloc_T.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Malloc_T.h * @@ -8,13 +8,13 @@ * * @author Doug Schmidt and Irfan Pyarali */ -//============================================================================= +//========================================================================== #ifndef ACE_MALLOC_T_H #define ACE_MALLOC_T_H #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Mem_Map.h b/ace/Mem_Map.h index c640c67a642..dc430c98ec0 100644 --- a/ace/Mem_Map.h +++ b/ace/Mem_Map.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Mem_Map.h * @@ -8,18 +8,21 @@ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_MEM_MAP_H #define ACE_MEM_MAP_H + #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS.h" + /** * @class ACE_Mem_Map * @@ -210,4 +213,5 @@ private: #endif /* __ACE_INLINE__ */ #include "ace/post.h" + #endif /* ACE_MEM_MAP_H */ diff --git a/ace/Message_Block.cpp b/ace/Message_Block.cpp index b0b13965ad6..01b8575aada 100644 --- a/ace/Message_Block.cpp +++ b/ace/Message_Block.cpp @@ -1,6 +1,5 @@ -// $Id$ - #include "ace/Message_Block.h" +#include "ace/Malloc_Base.h" #include "ace/Synch_T.h" //#define ACE_ENABLE_TIMEPROBES @@ -10,9 +9,11 @@ #include "ace/Message_Block.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, Message_Block, "$Id$") +ACE_RCSID (ace, + Message_Block, + "$Id$") -ACE_ALLOC_HOOK_DEFINE(ACE_Message_Block) +ACE_ALLOC_HOOK_DEFINE (ACE_Message_Block) #if defined (ACE_ENABLE_TIMEPROBES) diff --git a/ace/Message_Block.h b/ace/Message_Block.h index 2415a009da0..c768c05e27d 100644 --- a/ace/Message_Block.h +++ b/ace/Message_Block.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Message_Block.h * @@ -8,24 +8,27 @@ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ -//============================================================================= +//========================================================================== -#include "ace/ACE.h" +#ifndef ACE_MESSAGE_BLOCK_H +#define ACE_MESSAGE_BLOCK_H + +#include "ace/pre.h" + +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#ifndef ACE_MESSAGE_BLOCK_H -#define ACE_MESSAGE_BLOCK_H -#include "ace/pre.h" +#include "ace/OS.h" -#include "ace/Malloc.h" // Forward declaration. +class ACE_Allocator; class ACE_Data_Block; class ACE_Lock; -class ACE_Time_Value; + /** * @class ACE_Message_Block @@ -978,4 +981,5 @@ public: #include "ace/Message_Block_T.h" #include "ace/post.h" + #endif /* ACE_MESSAGE_BLOCK_H */ diff --git a/ace/Module.h b/ace/Module.h index a8320d63cda..c515ae350df 100644 --- a/ace/Module.h +++ b/ace/Module.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Module.h * @@ -8,13 +8,14 @@ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_MODULE_H #define ACE_MODULE_H + #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -204,4 +205,5 @@ private: #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include "ace/post.h" + #endif /* ACE_MODULE_H */ diff --git a/ace/NT_Service.h b/ace/NT_Service.h index 2793188a7a2..747221f1783 100644 --- a/ace/NT_Service.h +++ b/ace/NT_Service.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file NT_Service.h * @@ -8,10 +8,11 @@ * * @author Steve Huston <shuston@riverace.com> */ -//============================================================================= +//========================================================================== #ifndef ACE_NT_SERVICE_H #define ACE_NT_SERVICE_H + #include "ace/pre.h" #include "ace/config-all.h" @@ -22,6 +23,7 @@ #if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#include "ace/ACE.h" #include "ace/OS_Log_Msg_Attributes.h" #include "ace/Service_Object.h" #include "ace/Synch.h" @@ -430,4 +432,5 @@ extern VOID WINAPI ace_nt_svc_main_##SVCNAME (DWORD dwArgc, \ #endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ #include "ace/post.h" + #endif /* ACE_SERVICE_OBJECT_H */ diff --git a/ace/Name_Space.h b/ace/Name_Space.h index d4e461750a8..d65ee2f7b4f 100644 --- a/ace/Name_Space.h +++ b/ace/Name_Space.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Name_Space.h * @@ -8,14 +8,14 @@ * * @author Prashant Jain */ -//============================================================================= +//========================================================================== #ifndef ACE_NAME_SPACE_H #define ACE_NAME_SPACE_H #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Naming_Context.h b/ace/Naming_Context.h index 828866efb49..1e06892c6b2 100644 --- a/ace/Naming_Context.h +++ b/ace/Naming_Context.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Naming_Context.h * @@ -10,13 +10,13 @@ * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> * @author and Prashant Jain <pjain@uci.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_NAMING_CONTEXT_H #define ACE_NAMING_CONTEXT_H #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/OS_Memory.h b/ace/OS_Memory.h index 0902eff34c5..0e53f1f7981 100644 --- a/ace/OS_Memory.h +++ b/ace/OS_Memory.h @@ -36,10 +36,6 @@ # define ACE_MALLOC_ALIGN ((int) sizeof (long)) # endif /* ACE_MALLOC_ALIGN */ -# if !defined (ACE_HAS_POSITION_INDEPENDENT_POINTERS) -# define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1 -# endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS */ - // Allow an installation to replace the lowest-level allocation // functions without changing the source of ACE. // diff --git a/ace/PI_Malloc.cpp b/ace/PI_Malloc.cpp index 8299304f4fb..0901fec9642 100644 --- a/ace/PI_Malloc.cpp +++ b/ace/PI_Malloc.cpp @@ -1,17 +1,14 @@ -// $Id$ - -// FILENAME -// PI_Malloc.cpp -// -// AUTHOR -// Priyanka Gontla <pgontla@ece.uci.edu> -// -// ========================================================================= - -#if !defined (ACE_PI_MALLOC_CPP) +#ifndef ACE_PI_MALLOC_CPP #define ACE_PI_MALLOC_CPP #include "ace/PI_Malloc.h" + +ACE_RCSID (ace, + PI_Malloc, + "$Id$") + +#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) + #include "ace/Object_Manager.h" #include "ace/Process_Mutex.h" @@ -21,9 +18,6 @@ #include "ace/Synch_T.h" -ACE_RCSID(ace, PI_Malloc, "$Id$") - -#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) void ACE_PI_Control_Block::ACE_Malloc_Header::dump (void) const { @@ -155,9 +149,8 @@ ACE_PI_Control_Block::ACE_Name_Node::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } -#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ -#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Based_Pointer_Basic<ACE_PI_Control_Block::ACE_Malloc_Header>; template class ACE_Based_Pointer_Basic<ACE_PI_Control_Block::ACE_Name_Node>; @@ -171,6 +164,7 @@ template class ACE_Based_Pointer<ACE_PI_Control_Block::ACE_Name_Node>; #pragma instantiate ACE_Based_Pointer<ACE_PI_Control_Block::ACE_Malloc_Header> #pragma instantiate ACE_Based_Pointer<ACE_PI_Control_Block::ACE_Name_Node> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1*/ #endif /* ACE_PI_MALLOC_CPP */ diff --git a/ace/PI_Malloc.h b/ace/PI_Malloc.h index fcb0b0bbb75..bd65dc05e1d 100644 --- a/ace/PI_Malloc.h +++ b/ace/PI_Malloc.h @@ -1,26 +1,30 @@ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file PI_Malloc.h * * $Id$ * * @author Priyanka Gontla <pgontla@ece.uci.edu> + * @author Based on code that existed in other ACE files. */ -//============================================================================= +//========================================================================== #ifndef ACE_PI_MALLOC_H #define ACE_PI_MALLOC_H + #include "ace/pre.h" -#include "ace/ACE.h" -#include "Malloc.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) + +#include "ace/Malloc.h" #include "ace/Based_Pointer_T.h" // prepare for position independent malloc @@ -199,15 +203,13 @@ public: private: ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Control_Block &)) }; -#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ #if defined (__ACE_INLINE__) #include "ace/PI_Malloc.i" #endif /* __ACE_INLINE__ */ -// Include the ACE_Malloc templates and ACE_Memory_Pool classes at this point. -#include "ace/Malloc_T.h" -#include "ace/Memory_Pool.h" +#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ #include "ace/post.h" + #endif /* ACE_PI_MALLOC_H */ diff --git a/ace/Pipe.h b/ace/Pipe.h index d58767b1729..452857127c4 100644 --- a/ace/Pipe.h +++ b/ace/Pipe.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Pipe.h * @@ -8,19 +8,22 @@ * * @author Doug Schmidt */ -//============================================================================= +//========================================================================== #ifndef ACE_PIPE_H #define ACE_PIPE_H + #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS.h" + /** * @class ACE_Pipe * @@ -83,4 +86,5 @@ private: #endif /* ACE_LACKS_INLINE_FUNCTIONS */ #include "ace/post.h" + #endif /* ACE_PIPE_H */ diff --git a/ace/Profile_Timer.h b/ace/Profile_Timer.h index 0d2d0a1e772..20a9aacf925 100644 --- a/ace/Profile_Timer.h +++ b/ace/Profile_Timer.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Profile_Timer.h * @@ -8,20 +8,20 @@ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_PROFILE_TIMER_H #define ACE_PROFILE_TIMER_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/Time_Value.h" +#include "ace/OS.h" #include "ace/High_Res_Timer.h" /** diff --git a/ace/Read_Buffer.h b/ace/Read_Buffer.h index 6e3940a04d2..41ca78a4eee 100644 --- a/ace/Read_Buffer.h +++ b/ace/Read_Buffer.h @@ -1,27 +1,32 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Read_Buffer.h * * $Id$ * - * @author Doug Schmidt and Seth Widoff + * @author Doug Schmidt + * @author Seth Widoff */ -//============================================================================= +//========================================================================== #ifndef ACE_READ_BUFFER_H #define ACE_READ_BUFFER_H + #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Malloc.h" +#include "ace/OS.h" + +class ACE_Allocator; + /** * @class ACE_Read_Buffer @@ -115,4 +120,5 @@ private: #endif /* __ACE_INLINE__ */ #include "ace/post.h" + #endif /* ACE_READ_BUFFER_H */ diff --git a/ace/Remote_Name_Space.h b/ace/Remote_Name_Space.h index 968278a74c5..3ae6d37a34d 100644 --- a/ace/Remote_Name_Space.h +++ b/ace/Remote_Name_Space.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Remote_Name_Space.h * @@ -8,14 +8,15 @@ * * @author Prashant Jain */ -//============================================================================= +//========================================================================== #ifndef ACE_REMOTE_NAME_SPACE_H #define ACE_REMOTE_NAME_SPACE_H + #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -137,4 +138,5 @@ private: }; #include "ace/post.h" + #endif /* ACE_REMOTE_NAME_SPACE_H */ diff --git a/ace/SOCK.h b/ace/SOCK.h index bbed708afe0..427a7f85bb1 100644 --- a/ace/SOCK.h +++ b/ace/SOCK.h @@ -14,7 +14,7 @@ #define ACE_SOCK_H #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,6 +22,7 @@ #include "ace/Addr.h" #include "ace/IPC_SAP.h" +#include "ace/OS.h" /** * @class ACE_SOCK diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp index 7f73fd9b541..23f24b46dd8 100644 --- a/ace/SOCK_Dgram.cpp +++ b/ace/SOCK_Dgram.cpp @@ -1,19 +1,19 @@ -// SOCK_Dgram.cpp -// $Id$ - #include "ace/SOCK_Dgram.h" #include "ace/Handle_Set.h" #include "ace/Synch.h" #include "ace/Log_Msg.h" #include "ace/INET_Addr.h" +#include "ace/ACE.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) #include "ace/SOCK_Dgram.i" #endif -ACE_RCSID(ace, SOCK_Dgram, "$Id$") +ACE_RCSID (ace, + SOCK_Dgram, + "$Id$") -ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Dgram) +ACE_ALLOC_HOOK_DEFINE (ACE_SOCK_Dgram) void ACE_SOCK_Dgram::dump (void) const diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp index 2ca7530b51b..5261aa6122b 100644 --- a/ace/SOCK_Dgram_Mcast.cpp +++ b/ace/SOCK_Dgram_Mcast.cpp @@ -1,7 +1,6 @@ -// $Id$ - #include "ace/SOCK_Dgram_Mcast.h" #include "ace/INET_Addr.h" +#include "ace/ACE.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) #include "ace/SOCK_Dgram_Mcast.i" @@ -13,7 +12,9 @@ #define IMR_MULTIADDR imr_multiaddr #endif /* ! defined (IMR_MULTIADDR) */ -ACE_RCSID(ace, SOCK_Dgram_Mcast, "$Id$") +ACE_RCSID (ace, + SOCK_Dgram_Mcast, + "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Dgram_Mcast) diff --git a/ace/SOCK_IO.h b/ace/SOCK_IO.h index 0fbfee6203d..77ba78471fb 100644 --- a/ace/SOCK_IO.h +++ b/ace/SOCK_IO.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file SOCK_IO.h * @@ -8,10 +8,11 @@ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_SOCK_IO_H #define ACE_SOCK_IO_H + #include "ace/pre.h" #include "ace/SOCK.h" @@ -20,6 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/ACE.h" + /** * @class ACE_SOCK_IO * @@ -140,4 +143,5 @@ public: #endif #include "ace/post.h" + #endif /* ACE_SOCK_IO_H */ diff --git a/ace/SPIPE_Addr.h b/ace/SPIPE_Addr.h index b22dc0628f0..cff741219e8 100644 --- a/ace/SPIPE_Addr.h +++ b/ace/SPIPE_Addr.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file SPIPE_Addr.h * @@ -8,20 +8,22 @@ * * @author Doug Schmidt */ -//============================================================================= +//========================================================================== #ifndef ACE_SPIPE_ADDR_H #define ACE_SPIPE_ADDR_H + #include "ace/pre.h" -#include "ace/Addr.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/ACE.h" +#include "ace/Addr.h" +#include "ace/OS.h" /** * @class ACE_SPIPE_Addr @@ -112,4 +114,5 @@ private: #endif /* __ACE_INLINE__ */ #include "ace/post.h" + #endif /* ACE_SPIPE_ADDR_H */ diff --git a/ace/SPIPE_Stream.h b/ace/SPIPE_Stream.h index 1bbed754227..65d1ca36062 100644 --- a/ace/SPIPE_Stream.h +++ b/ace/SPIPE_Stream.h @@ -22,6 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/SPIPE_Addr.h" +#include "ace/ACE.h" /** * @class ACE_SPIPE_Stream diff --git a/ace/SV_Message.h b/ace/SV_Message.h index f2f4e55d7c8..e26c786c3e2 100644 --- a/ace/SV_Message.h +++ b/ace/SV_Message.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file SV_Message.h * @@ -8,19 +8,22 @@ * * @author Doug Schmidt */ -//============================================================================= +//========================================================================== #ifndef ACE_SV_MESSAGE_H #define ACE_SV_MESSAGE_H + #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS.h" + /** * @class ACE_SV_Message * @@ -55,4 +58,5 @@ protected: #endif /* __ACE_INLINE__ */ #include "ace/post.h" + #endif /* ACE_SV_MESSAGE_H */ diff --git a/ace/SV_Message_Queue.h b/ace/SV_Message_Queue.h index cc060daa220..92055767e3a 100644 --- a/ace/SV_Message_Queue.h +++ b/ace/SV_Message_Queue.h @@ -1,20 +1,21 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file SV_Message_Queue.h * * $Id$ * - * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> + * @author Douglas C. Schmidt <schmidt@uci.edu> */ -//============================================================================= +//=========================================================================== #ifndef ACE_SV_MESSAGE_QUEUE_H #define ACE_SV_MESSAGE_QUEUE_H + #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -93,4 +94,5 @@ protected: #endif #include "ace/post.h" + #endif /* ACE_SV_MESSAGE_QUEUE_H */ diff --git a/ace/SV_Semaphore_Simple.cpp b/ace/SV_Semaphore_Simple.cpp index ebb93233fc1..91740f54038 100644 --- a/ace/SV_Semaphore_Simple.cpp +++ b/ace/SV_Semaphore_Simple.cpp @@ -1,15 +1,17 @@ -// $Id$ - #include "ace/SV_Semaphore_Simple.h" #include "ace/Log_Msg.h" +#include "ace/ACE.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) #include "ace/SV_Semaphore_Simple.i" #endif -ACE_RCSID(ace, SV_Semaphore_Simple, "$Id$") +ACE_RCSID (ace, + SV_Semaphore_Simple, + "$Id$") + +ACE_ALLOC_HOOK_DEFINE (ACE_SV_Semaphore_Simple) -ACE_ALLOC_HOOK_DEFINE(ACE_SV_Semaphore_Simple) void ACE_SV_Semaphore_Simple::dump (void) const diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h index ac6126b2e8c..34cfdd179a0 100644 --- a/ace/SV_Semaphore_Simple.h +++ b/ace/SV_Semaphore_Simple.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file SV_Semaphore_Simple.h * @@ -8,18 +8,21 @@ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_SV_SEMAPHORE_SIMPLE_H #define ACE_SV_SEMAPHORE_SIMPLE_H + #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS.h" + /** * @class ACE_SV_Semaphore_Simple * @@ -155,4 +158,5 @@ protected: #endif #include "ace/post.h" + #endif /* _SV_SEMAPHORE_SIMPLE_H */ diff --git a/ace/SV_Shared_Memory.h b/ace/SV_Shared_Memory.h index 977d33f6faa..127dce8a486 100644 --- a/ace/SV_Shared_Memory.h +++ b/ace/SV_Shared_Memory.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file SV_Shared_Memory.h * @@ -8,18 +8,21 @@ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_SV_SHARED_MEMORY_H #define ACE_SV_SHARED_MEMORY_H + #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS.h" + /** * @class ACE_SV_Shared_Memory * @@ -109,4 +112,5 @@ protected: #endif /* __ACE_INLINE__ */ #include "ace/post.h" + #endif /* ACE_SV_SHARED_MEMORY_H */ diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp index 36303b12072..eae0a3cb023 100644 --- a/ace/Select_Reactor_T.cpp +++ b/ace/Select_Reactor_T.cpp @@ -9,6 +9,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/ACE.h" #include "ace/Log_Msg.h" #include "ace/Thread.h" #include "ace/Timer_Heap.h" @@ -966,16 +967,29 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::remove_handler_i } template <class ACE_SELECT_REACTOR_TOKEN> int -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::work_pending (const ACE_Time_Value &max_wait_time) +ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::work_pending ( + const ACE_Time_Value &max_wait_time) { - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); + ACE_TRACE ("ACE_Select_Reactor_T::work_pending"); + + ACE_Time_Value mwt (max_wait_time); + ACE_MT (ACE_Countdown_Time countdown (&mwt)); + + ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, + ace_mon, + this->token_, + -1)); + + if (this->deactivated_) + return 0; + + // Update the countdown to reflect time waiting for the mutex. + ACE_MT (countdown.update ()); ACE_Time_Value timer_buf (0); - ACE_Time_Value *max_wait_timep = ACE_const_cast (ACE_Time_Value *, - &max_wait_time); ACE_Time_Value *this_timeout = - this->timer_queue_->calculate_timeout (max_wait_timep, - &timer_buf); + this->timer_queue_->calculate_timeout (&mwt, &timer_buf); + u_long width = (u_long) this->handler_rep_.max_handlep1 (); ACE_Select_Reactor_Handle_Set fd_set; @@ -1269,12 +1283,13 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handle_events { ACE_TRACE ("ACE_Select_Reactor_T::handle_events"); +#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) + // Stash the current time -- the destructor of this object will // automatically compute how much time elapsed since this method was // called. ACE_Countdown_Time countdown (max_wait_time); -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1); if (ACE_OS::thr_equal (ACE_Thread::self (), diff --git a/ace/Service_Types.h b/ace/Service_Types.h index 47c77e9f195..8e306db409b 100644 --- a/ace/Service_Types.h +++ b/ace/Service_Types.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Service_Types.h * @@ -8,10 +8,11 @@ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_SERVICE_TYPE_H #define ACE_SERVICE_TYPE_H + #include "ace/pre.h" #include "ace/Service_Object.h" @@ -20,6 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/ACE.h" #include "ace/Synch.h" /** @@ -195,4 +197,5 @@ private: #endif /* __ACE_INLINE__ */ #include "ace/post.h" + #endif /* _SERVICE_TYPE_H */ diff --git a/ace/Shared_Memory.h b/ace/Shared_Memory.h index b97d92e2af8..2ee4dc907db 100644 --- a/ace/Shared_Memory.h +++ b/ace/Shared_Memory.h @@ -1,7 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- - -//============================================================================= +//========================================================================== /** * @file Shared_Memory.h * @@ -9,19 +8,22 @@ * * @author Doug Schmidt */ -//============================================================================= +//========================================================================== #ifndef ACE_SHARED_MEMORY_H #define ACE_SHARED_MEMORY_H + #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS.h" + /** * @class ACE_Shared_Memory * @@ -48,4 +50,5 @@ public: }; #include "ace/post.h" + #endif /* ACE_SHARED_MEMORY_H */ diff --git a/ace/Shared_Object.h b/ace/Shared_Object.h index dc6d1ed7480..5fe31543032 100644 --- a/ace/Shared_Object.h +++ b/ace/Shared_Object.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Shared_Object.h * @@ -8,18 +8,21 @@ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_SHARED_OBJECT_H #define ACE_SHARED_OBJECT_H + #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS.h" + /** * @class ACE_Shared_Object * @@ -48,4 +51,5 @@ public: #endif /* __ACE_INLINE__ */ #include "ace/post.h" + #endif /* ACE_SHARED_OBJECT_H */ diff --git a/ace/Sock_Connect.h b/ace/Sock_Connect.h index c50b0540672..f1be1c2d2ef 100644 --- a/ace/Sock_Connect.h +++ b/ace/Sock_Connect.h @@ -1,23 +1,29 @@ -//============================================================================= +// -*- C++ -*- + +//========================================================================== /** * @file Sock_Connect.h * * $Id$ * * @author Priyanka Gontla <pgontla@ece.uci.edu> + * @author Based on code that existed formerly in ACE.h. */ -//============================================================================= +//========================================================================== #ifndef ACE_SOCK_CONNECT_H #define ACE_SOCK_CONNECT_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.h" + // Forward Declarations class ACE_INET_Addr; @@ -86,4 +92,5 @@ private: #endif /* ACE_LACKS_INLINE_FUNCTIONS */ #include "ace/post.h" + #endif /* ACE_SOCK_CONNECT_H */ diff --git a/ace/Stats.h b/ace/Stats.h index 999fd6da7fa..5f2461a5faa 100644 --- a/ace/Stats.h +++ b/ace/Stats.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Stats.h * @@ -8,14 +8,15 @@ * * @author David L. Levine */ -//============================================================================= +//========================================================================== #ifndef ACE_STATS_H #define ACE_STATS_H + #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,6 +25,7 @@ #include "ace/Unbounded_Queue.h" #include "ace/Log_Msg.h" #include "ace/Basic_Stats.h" +#include "ace/OS.h" /** * @class ACE_Stats_Value @@ -267,4 +269,5 @@ private: #endif /* __ACE_INLINE__ */ #include "ace/post.h" + #endif /* ! ACE_STATS_H */ diff --git a/ace/Stream.h b/ace/Stream.h index 9e30b2c3ae3..b5bcbe002d9 100644 --- a/ace/Stream.h +++ b/ace/Stream.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Stream.h * @@ -8,13 +8,14 @@ * * @author Douglas C. Schmidt <schmidt@uci.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_STREAM_H #define ACE_STREAM_H + #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -228,4 +229,5 @@ private: #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include "ace/post.h" + #endif /* ACE_STREAM_H */ diff --git a/ace/Synch.h b/ace/Synch.h index 0d4ef01c24e..5f9c0c37027 100644 --- a/ace/Synch.h +++ b/ace/Synch.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Synch.h * @@ -10,24 +10,20 @@ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_SYNCH_H #define ACE_SYNCH_H #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// Forward declarations. -/** - * @class ACE_Time_Value; - template <class ACE_COND_MUTEX> class ACE_Condition; - */ -class ACE_Time_Value; +#include "ace/OS.h" + /** * @class ACE_Lock diff --git a/ace/Synch_Options.h b/ace/Synch_Options.h index f0c4903149d..82953be7e1b 100644 --- a/ace/Synch_Options.h +++ b/ace/Synch_Options.h @@ -1,25 +1,28 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Synch_Options.h * * $Id$ * - * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> + * @author Douglas C. Schmidt <schmidt@uci.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_SYNCH_OPTIONS_H #define ACE_SYNCH_OPTIONS_H + #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS.h" + /** * @class ACE_Synch_Options * @@ -150,4 +153,5 @@ private: #endif /* __ACE_INLINE__ */ #include "ace/post.h" + #endif /* ACE_SYNCH_OPTIONS_H */ diff --git a/ace/Thread.h b/ace/Thread.h index 9de66e1d3fe..58d1dddaceb 100644 --- a/ace/Thread.h +++ b/ace/Thread.h @@ -1,6 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Thread.h * @@ -8,19 +8,22 @@ * * @author Douglas Schmidt <schmidt@cs.wustl.edu> */ -//============================================================================= +//========================================================================== #ifndef ACE_THREAD_H #define ACE_THREAD_H + #include "ace/pre.h" -#include "ace/ACE.h" -#include "ace/Thread_Adapter.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS.h" +#include "ace/Thread_Adapter.h" + /** * @class ACE_Thread * @@ -236,5 +239,7 @@ private: #if defined (__ACE_INLINE__) #include "ace/Thread.i" #endif /* __ACE_INLINE__ */ + #include "ace/post.h" + #endif /* ACE_THREAD_H */ diff --git a/ace/Typed_SV_Message.h b/ace/Typed_SV_Message.h index 475084c177a..e3973d78590 100644 --- a/ace/Typed_SV_Message.h +++ b/ace/Typed_SV_Message.h @@ -1,7 +1,6 @@ -/* -*- C++ -*- */ +// -*- C++ -*- - -//============================================================================= +//========================================================================== /** * @file Typed_SV_Message.h * @@ -9,19 +8,22 @@ * * @author Doug Schmidt */ -//============================================================================= +//========================================================================== #ifndef ACE_TYPED_SV_MESSAGE_H #define ACE_TYPED_SV_MESSAGE_H + #include "ace/pre.h" -#include "ace/ACE.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS.h" + /** * @class ACE_Typed_SV_Message * @@ -99,4 +101,5 @@ private: #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include "ace/post.h" + #endif /* ACE_TYPED_SV_MESSAGE_H */ diff --git a/ace/Vector_T.h b/ace/Vector_T.h index 394b6e98b50..3157f8c42f5 100644 --- a/ace/Vector_T.h +++ b/ace/Vector_T.h @@ -1,6 +1,6 @@ // -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file Vector_T.h * @@ -9,13 +9,13 @@ * @author Craig L. Ching <cching@mqsoftware.com> * @author Gonzalo Diethelm <gonzalo.diethelm@aditiva.com> */ -//============================================================================= +//========================================================================== #ifndef ACE_VECTOR_T_H #define ACE_VECTOR_T_H + #include "ace/pre.h" -#include "ace/ACE.h" #include "ace/Array.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -240,4 +240,5 @@ bool partial_compare (const ACE_Vector<T>& v1, #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include "ace/post.h" + #endif /* ACE_VECTOR_T_H */ diff --git a/ace/config-all.h b/ace/config-all.h index 810d3d588af..395eb68d2a9 100644 --- a/ace/config-all.h +++ b/ace/config-all.h @@ -1,6 +1,6 @@ // -*- C++ -*- -//============================================================================= +//========================================================================== /** * @file config-all.h * @@ -10,7 +10,7 @@ * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... */ -//============================================================================= +//========================================================================== #ifndef ACE_CONFIG_ALL_H #define ACE_CONFIG_ALL_H @@ -22,9 +22,17 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// ============================================================================ +// ========================================================================= +// Enable/Disable Features By Default +// ========================================================================= + +# if !defined (ACE_HAS_POSITION_INDEPENDENT_POINTERS) +# define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1 +# endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS */ + +// ========================================================================= // RCSID Macros -// ============================================================================ +// ========================================================================= // By default, DO include RCS Id strings in object code. #if ! defined (ACE_USE_RCSID) @@ -61,11 +69,11 @@ # define ACE_RCSID(path, file, id) /* noop */ #endif /* #if (defined (ACE_USE_RCSID) && (ACE_USE_RCSID != 0)) */ -// ============================================================================ +// ========================================================================= // INLINE macros // // These macros handle all the inlining of code via the .i or .inl files -// ============================================================================ +// ========================================================================= #if defined (ACE_LACKS_INLINE_FUNCTIONS) && !defined (ACE_NO_INLINE) # define ACE_NO_INLINE @@ -107,9 +115,9 @@ # define ASYS_INLINE inline # endif /* ACE_LACKS_INLINE_FUNCTIONS */ -// ============================================================================ +// ========================================================================= // EXPLICIT macro -// ============================================================================ +// ========================================================================= # if defined (ACE_HAS_EXPLICIT_KEYWORD) # define ACE_EXPLICIT explicit @@ -117,9 +125,9 @@ # define ACE_EXPLICIT # endif /* ! ACE_HAS_EXPLICIT_KEYWORD */ -// ============================================================================ +// ========================================================================= // MUTABLE macro -// ============================================================================ +// ========================================================================= # if defined (ACE_HAS_MUTABLE_KEYWORD) # define ACE_MUTABLE mutable diff --git a/ace/config-win32-msvc-6.h b/ace/config-win32-msvc-6.h index f2049774a53..a66bd3d330b 100644 --- a/ace/config-win32-msvc-6.h +++ b/ace/config-win32-msvc-6.h @@ -175,20 +175,6 @@ # define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") # define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") -# if !defined (ACE_LD_DECORATOR_STR) -# if defined (_DEBUG) -# if ACE_HAS_MFC == 1 -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("mfcd") -# else -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("d") -# endif //ACE_HAS_MFC -# else // _NDEBUG -# if ACE_HAS_MFC == 1 -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("mfc") -# endif //ACE_HAS_MFC -# endif // _DEBUG -# endif - # if !defined (ACE_ENDTHREADEX) # define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) # endif diff --git a/ace/config-win32-msvc.h b/ace/config-win32-msvc.h index 2e162554194..2f4ba23847a 100644 --- a/ace/config-win32-msvc.h +++ b/ace/config-win32-msvc.h @@ -29,6 +29,23 @@ #define ACE_CC_MINOR_VERSION (_MSC_VER % 100) #define ACE_CC_BETA_VERSION (0) +// Support "decorated" library names for MSVC 6 or better. +#if (_MSC_VER >= 1200) +# if !defined (ACE_LD_DECORATOR_STR) +# if defined (_DEBUG) +# if ACE_HAS_MFC == 1 +# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("mfcd") +# else +# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("d") +# endif /* ACE_HAS_MFC */ +# else /* _NDEBUG */ +# if ACE_HAS_MFC == 1 +# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("mfc") +# endif /* ACE_HAS_MFC */ +# endif /* _DEBUG */ +# endif /* ACE_LD_DECORATOR_STR */ +#endif /* _MSC_VER >= 1200 */ + #if (_MSC_VER >= 1300) # include "ace/config-win32-msvc-7.h" #elif (_MSC_VER >= 1200) diff --git a/tests/test_config.h b/tests/test_config.h index 45bed7257ef..b5e4f5b826d 100644 --- a/tests/test_config.h +++ b/tests/test_config.h @@ -1,21 +1,19 @@ -/* -*- C++ -*- */ -// $Id$ +// -*- C++ -*- + // ============================================================================ -// -// = FILENAME -// test_config.h -// -// = DESCRIPTION -// -// This file factors out common macros and other utilities used by the -// ACE automated regression tests. -// -// = AUTHOR -// Prashant Jain <pjain@cs.wustl.edu>, -// Tim Harrison <harrison@cs.wustl.edu>, and -// David Levine <levine@cs.wustl.edu> -// +/** + * @file test_config.h + * + * $Id$ + * + * This file factors out common macros and other utilities used by the + * ACE automated regression tests. + * + * @author Prashant Jain <pjain@cs.wustl.edu> + * @author Tim Harrison <harrison@cs.wustl.edu> + * @author David Levine <levine@cs.wustl.edu> + */ // ============================================================================ #ifndef ACE_TEST_CONFIG_H @@ -39,6 +37,7 @@ #include "ace/Singleton.h" #include "ace/Synch.h" #include "ace/Log_Msg.h" +#include "ace/ACE.h" // The second #undef protects against being reset in a config.h file. #undef ACE_NDEBUG |