From e150ebbecf9525a47a1a144fe202a2f83b396c39 Mon Sep 17 00:00:00 2001 From: schmidt Date: Wed, 14 Oct 1998 21:45:15 +0000 Subject: . --- ace/ACE.h | 4 + ace/ARGV.h | 4 + ace/Acceptor.h | 4 + ace/Activation_Queue.h | 4 + ace/Addr.h | 4 + ace/Array.h | 4 + ace/Asynch_Acceptor.h | 4 + ace/Asynch_IO.h | 4 + ace/Auto_Ptr.h | 4 + ace/Basic_Types.h | 4 + ace/CORBA_Handler.h | 4 + ace/CORBA_Ref.h | 5 +- ace/Connector.h | 4 + ace/Containers.h | 4 + ace/Containers_T.h | 4 + ace/DEV.h | 5 +- ace/DEV_Addr.h | 5 +- ace/DEV_Connector.h | 4 + ace/DEV_IO.h | 4 + ace/Date_Time.h | 4 + ace/Dirent.h | 4 + ace/Dump.h | 4 + ace/Dump_T.h | 5 +- ace/Dynamic.h | 5 +- ace/Dynamic_Service.h | 5 +- ace/Env_Value_T.h | 4 + ace/Event_Handler.h | 4 + ace/Event_Handler_T.h | 4 + ace/FIFO.h | 5 +- ace/FIFO_Recv.h | 4 + ace/FIFO_Recv_Msg.h | 4 + ace/FIFO_Send.h | 5 +- ace/FIFO_Send_Msg.h | 5 +- ace/FILE.h | 4 + ace/FILE_Addr.h | 4 + ace/FILE_Connector.h | 4 + ace/FILE_IO.h | 4 + ace/Filecache.h | 4 + ace/Free_List.h | 4 + ace/Functor.h | 19 ++-- ace/Functor.i | 14 +++ ace/Functor_T.h | 4 + ace/Future.h | 4 + ace/Get_Opt.h | 4 + ace/Handle_Set.h | 4 + ace/Hash_Map_Manager.h | 4 + ace/High_Res_Timer.h | 4 + ace/INET_Addr.h | 4 + ace/IOStream.h | 5 +- ace/IOStream_T.h | 4 + ace/IO_Cntl_Msg.h | 4 + ace/IO_SAP.h | 4 + ace/IPC_SAP.h | 4 + ace/LOCK_SOCK_Acceptor.h | 4 + ace/LSOCK.h | 4 + ace/LSOCK_CODgram.h | 5 +- ace/LSOCK_Connector.h | 4 + ace/LSOCK_Dgram.h | 4 + ace/LSOCK_Stream.h | 4 + ace/Local_Name_Space.h | 4 + ace/Local_Name_Space_T.h | 4 + ace/Local_Tokens.h | 4 + ace/Log_Msg.h | 6 +- ace/Log_Record.h | 4 + ace/Malloc.h | 6 +- ace/Malloc_Base.h | 5 ++ ace/Malloc_T.h | 4 + ace/Managed_Object.h | 4 + ace/Map_Manager.h | 4 + ace/Mem_Map.h | 4 + ace/Memory_Pool.h | 4 + ace/Message_Block.h | 4 + ace/Message_Block_T.h | 4 + ace/Message_Queue.h | 4 + ace/Message_Queue_T.h | 6 +- ace/Method_Object.h | 5 +- ace/Module.h | 4 + ace/Msg_WFMO_Reactor.h | 5 ++ ace/Multiplexor.h | 6 +- ace/NT_Service.h | 11 ++- ace/Name_Proxy.h | 5 +- ace/Name_Request_Reply.h | 5 +- ace/Name_Space.h | 4 + ace/Naming_Context.h | 4 + ace/OS.h | 4 + ace/Object_Manager.h | 4 + ace/Obstack.h | 4 + ace/Parse_Node.h | 4 + ace/Pipe.h | 5 +- ace/Priority_Reactor.h | 4 + ace/Proactor.h | 4 + ace/Process.h | 4 + ace/Process_Manager.h | 4 + ace/Profile_Timer.h | 4 + ace/RB_Tree.h | 210 +++++++++++++++++++++---------------------- ace/README | 1 + ace/Reactor.h | 10 ++- ace/Reactor_Impl.h | 4 + ace/Read_Buffer.h | 4 + ace/Registry.h | 5 +- ace/Registry_Name_Space.h | 4 + ace/Remote_Name_Space.h | 6 +- ace/Remote_Tokens.h | 5 +- ace/SOCK.h | 4 + ace/SOCK_Acceptor.h | 4 + ace/SOCK_CODgram.h | 5 +- ace/SOCK_Connector.h | 4 + ace/SOCK_Dgram.h | 4 + ace/SOCK_Dgram_Bcast.h | 4 + ace/SOCK_Dgram_Mcast.h | 4 + ace/SOCK_IO.h | 4 + ace/SOCK_Stream.h | 5 +- ace/SPIPE.h | 4 + ace/SPIPE_Acceptor.h | 3 + ace/SPIPE_Addr.h | 6 +- ace/SPIPE_Connector.h | 4 + ace/SPIPE_Stream.h | 4 + ace/SString.h | 4 + ace/SV_Message.h | 5 +- ace/SV_Message_Queue.h | 4 + ace/SV_Semaphore_Complex.h | 4 + ace/SV_Semaphore_Simple.h | 4 + ace/SV_Shared_Memory.h | 4 + ace/Sched_Params.h | 4 + ace/Select_Reactor.h | 4 + ace/Select_Reactor_Base.h | 4 + ace/Select_Reactor_T.cpp | 29 +++--- ace/Select_Reactor_T.h | 20 +++-- ace/Service_Config.h | 4 + ace/Service_Manager.h | 4 + ace/Service_Object.h | 4 + ace/Service_Repository.h | 4 + ace/Service_Types.h | 4 + ace/Shared_Memory.h | 4 + ace/Shared_Memory_MM.h | 4 + ace/Shared_Memory_SV.h | 4 + ace/Shared_Object.h | 4 + ace/Signal.h | 4 + ace/Singleton.h | 4 + ace/Stats.h | 4 + ace/Strategies.h | 4 + ace/Strategies_T.h | 4 + ace/Stream.h | 6 +- ace/Stream_Modules.h | 5 ++ ace/Svc_Conf.h | 4 + ace/Svc_Handler.h | 4 + ace/Synch.h | 5 ++ ace/Synch_Options.h | 4 + ace/Synch_T.h | 4 + ace/System_Time.h | 4 + ace/TLI.h | 4 + ace/TLI_Acceptor.h | 4 + ace/TLI_Connector.h | 4 + ace/TLI_Stream.h | 4 + ace/TP_Reactor.h | 4 + ace/TTY_IO.h | 10 ++- ace/Task.h | 4 + ace/Task_T.h | 4 + ace/Thread.h | 4 + ace/Thread_Manager.h | 4 + ace/Time_Request_Reply.h | 4 + ace/Time_Value.h | 4 + ace/Timeprobe.h | 4 + ace/Timeprobe_T.h | 4 + ace/Timer_Hash.h | 5 ++ ace/Timer_Hash_T.h | 4 + ace/Timer_Heap.h | 4 + ace/Timer_Heap_T.h | 4 + ace/Timer_List.h | 4 + ace/Timer_List_T.h | 4 + ace/Timer_Queue.h | 4 + ace/Timer_Queue_Adapters.h | 4 + ace/Timer_Queue_T.h | 4 + ace/Timer_Wheel.h | 4 + ace/Timer_Wheel_T.h | 4 + ace/Token.h | 4 + ace/Token_Collection.h | 5 +- ace/Token_Invariants.h | 5 +- ace/Token_Manager.h | 4 + ace/Token_Request_Reply.h | 4 + ace/Typed_SV_Message.h | 4 + ace/Typed_SV_Message_Queue.h | 4 + ace/UNIX_Addr.h | 5 ++ ace/UPIPE_Acceptor.h | 4 + ace/UPIPE_Addr.h | 4 + ace/UPIPE_Connector.h | 4 + ace/UPIPE_Stream.h | 4 + ace/WFMO_Reactor.h | 10 ++- ace/XtReactor.h | 4 + ace/inc_user_config.h | 4 + ace/iosfwd.h | 4 + ace/streams.h | 4 + 192 files changed, 920 insertions(+), 183 deletions(-) diff --git a/ace/ACE.h b/ace/ACE.h index 3c9feaa7acd..8c2a15c3818 100644 --- a/ace/ACE.h +++ b/ace/ACE.h @@ -16,6 +16,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if !defined (ACE_ACE_H) #define ACE_ACE_H diff --git a/ace/ARGV.h b/ace/ARGV.h index b1a536572e4..9eb271c9799 100644 --- a/ace/ARGV.h +++ b/ace/ARGV.h @@ -20,6 +20,10 @@ #include "ace/ACE.h" #include "ace/Containers.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_ARGV { // = TITLE diff --git a/ace/Acceptor.h b/ace/Acceptor.h index 20954349721..cf5aaeb529f 100644 --- a/ace/Acceptor.h +++ b/ace/Acceptor.h @@ -22,6 +22,10 @@ #include "ace/Svc_Handler.h" #include "ace/Strategies.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Acceptor : public ACE_Service_Object { diff --git a/ace/Activation_Queue.h b/ace/Activation_Queue.h index ab6f265c7e9..4eed98369d6 100644 --- a/ace/Activation_Queue.h +++ b/ace/Activation_Queue.h @@ -22,6 +22,10 @@ #include "ace/Message_Queue.h" #include "ace/Method_Object.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Activation_Queue { // = TITLE diff --git a/ace/Addr.h b/ace/Addr.h index 91f98d5104b..443a7f6d645 100644 --- a/ace/Addr.h +++ b/ace/Addr.h @@ -19,6 +19,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Addr { // = TITLE diff --git a/ace/Array.h b/ace/Array.h index 2b21ea5ee5b..74c6e277216 100644 --- a/ace/Array.h +++ b/ace/Array.h @@ -23,6 +23,10 @@ #include "ace/Containers.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (__ACE_INLINE__) #include "ace/Containers.i" #endif /* __ACE_INLINE__ */ diff --git a/ace/Asynch_Acceptor.h b/ace/Asynch_Acceptor.h index f01d2716778..b36b546d44c 100644 --- a/ace/Asynch_Acceptor.h +++ b/ace/Asynch_Acceptor.h @@ -18,6 +18,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) // This only works on platforms that support async i/o. diff --git a/ace/Asynch_IO.h b/ace/Asynch_IO.h index 0e2c513ec0e..98ad5655f73 100644 --- a/ace/Asynch_IO.h +++ b/ace/Asynch_IO.h @@ -29,6 +29,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \ (defined (ACE_HAS_AIO_CALLS)) diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h index 5ac032a2fb7..54bd64e32a8 100644 --- a/ace/Auto_Ptr.h +++ b/ace/Auto_Ptr.h @@ -20,6 +20,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Auto_Basic_Ptr { diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h index 9b8cc9d7293..3a38cb421b3 100644 --- a/ace/Basic_Types.h +++ b/ace/Basic_Types.h @@ -47,6 +47,10 @@ #if !defined (ACE_BASIC_TYPES_H) #define ACE_BASIC_TYPES_H +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // A char always has 1 byte, by definition. #define ACE_SIZEOF_CHAR 1 diff --git a/ace/CORBA_Handler.h b/ace/CORBA_Handler.h index d63eb30f9d6..e12f3f48dbe 100644 --- a/ace/CORBA_Handler.h +++ b/ace/CORBA_Handler.h @@ -21,6 +21,10 @@ #include "ace/Service_Config.h" #include "ace/Pipe.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if (defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0)) || (defined (ACE_HAS_MT_ORBIX) && (ACE_HAS_MT_ORBIX != 0)) #define EXCEPTIONS #define WANT_ORBIX_FDS diff --git a/ace/CORBA_Ref.h b/ace/CORBA_Ref.h index a93a4412f39..93bdacb0511 100644 --- a/ace/CORBA_Ref.h +++ b/ace/CORBA_Ref.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -24,6 +23,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_CORBA_Ref { diff --git a/ace/Connector.h b/ace/Connector.h index 656e05d9f1a..61f1a8a632d 100644 --- a/ace/Connector.h +++ b/ace/Connector.h @@ -23,6 +23,10 @@ #include "ace/Svc_Handler.h" #include "ace/Strategies.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Svc_Tuple { diff --git a/ace/Containers.h b/ace/Containers.h index b42f820a524..3cec86db71d 100644 --- a/ace/Containers.h +++ b/ace/Containers.h @@ -19,6 +19,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Double_Linked_List; diff --git a/ace/Containers_T.h b/ace/Containers_T.h index bb1d445ff17..6a11b717918 100644 --- a/ace/Containers_T.h +++ b/ace/Containers_T.h @@ -20,6 +20,10 @@ #include "ace/ACE.h" #include "ace/Containers.h" /* Need ACE_DLList_Node */ +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Allocator; template diff --git a/ace/DEV.h b/ace/DEV.h index 495fcb75b35..2836caee151 100644 --- a/ace/DEV.h +++ b/ace/DEV.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -21,6 +20,10 @@ #include "ace/IO_SAP.h" #include "ace/DEV_Addr.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // The following is necessary since many C++ compilers don't support // typedef'd types inside of classes used as formal template // arguments... ;-(. Luckily, using the C++ preprocessor I can hide diff --git a/ace/DEV_Addr.h b/ace/DEV_Addr.h index 02bf6fa565d..6065d1916cc 100644 --- a/ace/DEV_Addr.h +++ b/ace/DEV_Addr.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -21,6 +20,10 @@ #include "ace/Addr.h" #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_DEV_Addr : public ACE_Addr { // = TITLE diff --git a/ace/DEV_Connector.h b/ace/DEV_Connector.h index 7c706e5d697..845c610531a 100644 --- a/ace/DEV_Connector.h +++ b/ace/DEV_Connector.h @@ -19,6 +19,10 @@ #include "ace/DEV_IO.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_DEV_Connector : public ACE_DEV { // = TITLE diff --git a/ace/DEV_IO.h b/ace/DEV_IO.h index f5362f6989e..52d90205921 100644 --- a/ace/DEV_IO.h +++ b/ace/DEV_IO.h @@ -20,6 +20,10 @@ #include "ace/DEV.h" #include "ace/DEV_Addr.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_DEV_IO : public ACE_DEV { // = TITLE diff --git a/ace/Date_Time.h b/ace/Date_Time.h index 8c8fa867d0d..88aee2299bb 100644 --- a/ace/Date_Time.h +++ b/ace/Date_Time.h @@ -19,6 +19,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Date_Time { // = TITLE diff --git a/ace/Dirent.h b/ace/Dirent.h index 28ac5592f04..e7830f47457 100644 --- a/ace/Dirent.h +++ b/ace/Dirent.h @@ -22,6 +22,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Dirent { // = TITLE diff --git a/ace/Dump.h b/ace/Dump.h index dba4b03965d..1f709ad9340 100644 --- a/ace/Dump.h +++ b/ace/Dump.h @@ -53,6 +53,10 @@ #include "ace/Synch.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Dumpable { // = TITLE diff --git a/ace/Dump_T.h b/ace/Dump_T.h index 2aadc9892b8..fa8916064d9 100644 --- a/ace/Dump_T.h +++ b/ace/Dump_T.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -20,6 +19,10 @@ #include "ace/Dump.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Dumpable_Adapter : public ACE_Dumpable { diff --git a/ace/Dynamic.h b/ace/Dynamic.h index f6d69c62ae7..f824e5e0462 100644 --- a/ace/Dynamic.h +++ b/ace/Dynamic.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -22,6 +21,10 @@ #include "ace/Synch_T.h" #include "ace/Singleton.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Dynamic { // = TITLE diff --git a/ace/Dynamic_Service.h b/ace/Dynamic_Service.h index 1f305f00a96..bd7ef408f16 100644 --- a/ace/Dynamic_Service.h +++ b/ace/Dynamic_Service.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -18,6 +17,10 @@ #if !defined (ACE_DYNAMIC_SERVICE_H) #define ACE_DYNAMIC_SERVICE_H +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Dynamic_Service { diff --git a/ace/Env_Value_T.h b/ace/Env_Value_T.h index 60373636e72..2ff9b18323d 100644 --- a/ace/Env_Value_T.h +++ b/ace/Env_Value_T.h @@ -20,6 +20,10 @@ #include "ace/OS.h" // Need to get ACE_static_cast definition +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Env_Value { diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h index 221e7811633..453f4c6ed70 100644 --- a/ace/Event_Handler.h +++ b/ace/Event_Handler.h @@ -19,6 +19,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Forward declaration. class ACE_Message_Block; class ACE_Reactor; diff --git a/ace/Event_Handler_T.h b/ace/Event_Handler_T.h index 6fce5493a88..7c3081d247f 100644 --- a/ace/Event_Handler_T.h +++ b/ace/Event_Handler_T.h @@ -19,6 +19,10 @@ #include "ace/Event_Handler.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_TEMPLATE_TYPEDEFS) template diff --git a/ace/FIFO.h b/ace/FIFO.h index 1aaec751d15..d9a48bc265f 100644 --- a/ace/FIFO.h +++ b/ace/FIFO.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -20,6 +19,10 @@ #include "ace/IPC_SAP.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_FIFO : public ACE_IPC_SAP { // = TITLE diff --git a/ace/FIFO_Recv.h b/ace/FIFO_Recv.h index 7698f0aafef..4b38cf991f1 100644 --- a/ace/FIFO_Recv.h +++ b/ace/FIFO_Recv.h @@ -19,6 +19,10 @@ #include "ace/FIFO.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_FIFO_Recv : public ACE_FIFO { // = TITLE diff --git a/ace/FIFO_Recv_Msg.h b/ace/FIFO_Recv_Msg.h index 0269f2de91b..4134f593778 100644 --- a/ace/FIFO_Recv_Msg.h +++ b/ace/FIFO_Recv_Msg.h @@ -19,6 +19,10 @@ #include "ace/FIFO_Recv.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_FIFO_Recv_Msg : public ACE_FIFO_Recv { // = TITLE diff --git a/ace/FIFO_Send.h b/ace/FIFO_Send.h index 9106cb3a97d..d6d13683330 100644 --- a/ace/FIFO_Send.h +++ b/ace/FIFO_Send.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -20,6 +19,10 @@ #include "ace/FIFO.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_FIFO_Send : public ACE_FIFO { // = TITLE diff --git a/ace/FIFO_Send_Msg.h b/ace/FIFO_Send_Msg.h index 92e0cee2a56..55726ea36cc 100644 --- a/ace/FIFO_Send_Msg.h +++ b/ace/FIFO_Send_Msg.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -20,6 +19,10 @@ #include "ace/FIFO_Send.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_FIFO_Send_Msg : public ACE_FIFO_Send { // = TITLE diff --git a/ace/FILE.h b/ace/FILE.h index 172a4f16fb2..5636e8128bb 100644 --- a/ace/FILE.h +++ b/ace/FILE.h @@ -20,6 +20,10 @@ #include "ace/IO_SAP.h" #include "ace/FILE_Addr.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // The following is necessary since many C++ compilers don't support // typedef'd types inside of classes used as formal template // arguments... ;-(. Luckily, using the C++ preprocessor I can hide diff --git a/ace/FILE_Addr.h b/ace/FILE_Addr.h index d1458539596..462a720c0bf 100644 --- a/ace/FILE_Addr.h +++ b/ace/FILE_Addr.h @@ -20,6 +20,10 @@ #include "ace/Addr.h" #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_FILE_Addr : public ACE_Addr { // = TITLE diff --git a/ace/FILE_Connector.h b/ace/FILE_Connector.h index 1d4b32d9615..63ee7c063c3 100644 --- a/ace/FILE_Connector.h +++ b/ace/FILE_Connector.h @@ -19,6 +19,10 @@ #include "ace/FILE_IO.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_FILE_Connector { // = TITLE diff --git a/ace/FILE_IO.h b/ace/FILE_IO.h index b7ddcbce2c8..8bfe350d4d8 100644 --- a/ace/FILE_IO.h +++ b/ace/FILE_IO.h @@ -20,6 +20,10 @@ #include "ace/FILE.h" #include "ace/FILE_Addr.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_FILE_IO : public ACE_FILE { // = TITLE diff --git a/ace/Filecache.h b/ace/Filecache.h index b2ac229e0f2..a9252dbb898 100644 --- a/ace/Filecache.h +++ b/ace/Filecache.h @@ -23,6 +23,10 @@ #include "ace/Hash_Map_Manager.h" #include "ace/SString.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + enum ACE_Filecache_Flag { ACE_NOMAP = 0, diff --git a/ace/Free_List.h b/ace/Free_List.h index f8e7b0223be..f2a6223a7cb 100644 --- a/ace/Free_List.h +++ b/ace/Free_List.h @@ -21,6 +21,10 @@ #include "ace/OS.h" #include "ace/Synch_T.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Free_List { diff --git a/ace/Functor.h b/ace/Functor.h index 6095dc18742..766378ad6e7 100644 --- a/ace/Functor.h +++ b/ace/Functor.h @@ -29,6 +29,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Command_Base { // = TITLE @@ -40,22 +44,21 @@ class ACE_Command_Base // independent of the effect of the command, or the objects used // to implement it. public: - - ACE_Command_Base (void) {} + // = Initialization and termination methods. + ACE_Command_Base (void) // Default constructor. - virtual ~ACE_Command_Base (void) {} + virtual ~ACE_Command_Base (void); // Virtaul destructor. virtual int execute (void *arg = 0) = 0; // Invokes the method encapsulated by the command, passing along the // passed argument (if any). Users of classes derived from this - // class must ensure that the resulting invocation can tolerate - // a null void pointer being passed, or otherwise ensure that - // this will never occur. + // class must ensure that the resulting invocation can tolerate a + // null void pointer being passed, or otherwise ensure that this + // will never occur. }; - #if defined (__ACE_INLINE__) #include "ace/Functor.i" #endif /* __ACE_INLINE__ */ @@ -65,5 +68,3 @@ public: #endif /* ACE_FUNCTOR_H */ - -// EOF diff --git a/ace/Functor.i b/ace/Functor.i index e605408bb83..a7f584e6ee9 100644 --- a/ace/Functor.i +++ b/ace/Functor.i @@ -26,3 +26,17 @@ // ============================================================================ // EOF + +// Default constructor. + +ACE_INLINE +ACE_Command_Base::ACE_Command_Base (void) +{ +} + +// Virtaul destructor. + +ACE_INLINE +ACE_Command_Base::~ACE_Command_Base (void) +{ +} diff --git a/ace/Functor_T.h b/ace/Functor_T.h index 9b879e5ab75..ff26c1a01b8 100644 --- a/ace/Functor_T.h +++ b/ace/Functor_T.h @@ -29,6 +29,10 @@ #include "ace/Functor.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Command_Callback : public ACE_Command_Base { diff --git a/ace/Future.h b/ace/Future.h index 4677fcd164d..7d0aa301a8b 100644 --- a/ace/Future.h +++ b/ace/Future.h @@ -21,6 +21,10 @@ #include "ace/Synch.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_THREADS) // Forward decl. diff --git a/ace/Get_Opt.h b/ace/Get_Opt.h index 7409e0bef6d..b8c4bc6a3f9 100644 --- a/ace/Get_Opt.h +++ b/ace/Get_Opt.h @@ -19,6 +19,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Get_Opt { // = TITLE diff --git a/ace/Handle_Set.h b/ace/Handle_Set.h index 59662920575..68822bf5097 100644 --- a/ace/Handle_Set.h +++ b/ace/Handle_Set.h @@ -19,6 +19,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Handle_Set { // = TITLE diff --git a/ace/Hash_Map_Manager.h b/ace/Hash_Map_Manager.h index 3ee3b36e5f7..8b7d8caf592 100644 --- a/ace/Hash_Map_Manager.h +++ b/ace/Hash_Map_Manager.h @@ -19,6 +19,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Allocator; template diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h index 29f4ccdd315..ac5f34e3418 100644 --- a/ace/High_Res_Timer.h +++ b/ace/High_Res_Timer.h @@ -19,6 +19,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_High_Res_Timer { // = TITLE diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h index b9d432f91f0..5253a5892c6 100644 --- a/ace/INET_Addr.h +++ b/ace/INET_Addr.h @@ -20,6 +20,10 @@ #include "ace/ACE.h" #include "ace/Addr.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_INET_Addr : public ACE_Addr { // = TITLE diff --git a/ace/IOStream.h b/ace/IOStream.h index d9aba01c61a..16ff622d9f8 100644 --- a/ace/IOStream.h +++ b/ace/IOStream.h @@ -19,6 +19,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if !defined (ACE_LACKS_ACE_IOSTREAM) #include "ace/INET_Addr.h" @@ -51,7 +55,6 @@ typedef string ACE_IOStream_String; # endif /* __DECCXX_VER < 50700000 */ #endif /* __DECCXX_VER */ - class ACE_Export ACE_Quoted_String : public ACE_IOStream_String { public: diff --git a/ace/IOStream_T.h b/ace/IOStream_T.h index 2a35aa27697..94e41e2c621 100644 --- a/ace/IOStream_T.h +++ b/ace/IOStream_T.h @@ -24,6 +24,10 @@ #include "ace/IOStream.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if !defined (ACE_LACKS_ACE_IOSTREAM) #if defined (ACE_HAS_STRING_CLASS) diff --git a/ace/IO_Cntl_Msg.h b/ace/IO_Cntl_Msg.h index 894eb34c746..e508d6f44b0 100644 --- a/ace/IO_Cntl_Msg.h +++ b/ace/IO_Cntl_Msg.h @@ -17,6 +17,10 @@ #if !defined (ACE_IO_CNTL_MSG_H) #define ACE_IO_CNTL_MSG_H +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_IO_Cntl_Msg { // = TITLE diff --git a/ace/IO_SAP.h b/ace/IO_SAP.h index 421fb06e468..5f2df308213 100644 --- a/ace/IO_SAP.h +++ b/ace/IO_SAP.h @@ -19,6 +19,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_IO_SAP { // = TITLE diff --git a/ace/IPC_SAP.h b/ace/IPC_SAP.h index 7d168b53ccf..b371be16ee4 100644 --- a/ace/IPC_SAP.h +++ b/ace/IPC_SAP.h @@ -19,6 +19,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_IPC_SAP { // = TITLE diff --git a/ace/LOCK_SOCK_Acceptor.h b/ace/LOCK_SOCK_Acceptor.h index 4e7c4c02dff..c965dd102a9 100644 --- a/ace/LOCK_SOCK_Acceptor.h +++ b/ace/LOCK_SOCK_Acceptor.h @@ -18,6 +18,10 @@ #include "ace/SOCK_Acceptor.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_LOCK_SOCK_Acceptor : public ACE_SOCK_Acceptor { diff --git a/ace/LSOCK.h b/ace/LSOCK.h index 7da8184d830..63630af08bb 100644 --- a/ace/LSOCK.h +++ b/ace/LSOCK.h @@ -21,6 +21,10 @@ #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_LSOCK { // = TITLE diff --git a/ace/LSOCK_CODgram.h b/ace/LSOCK_CODgram.h index 5567639dc34..1562b2c1aeb 100644 --- a/ace/LSOCK_CODgram.h +++ b/ace/LSOCK_CODgram.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -22,6 +21,10 @@ #include "ace/SOCK_CODgram.h" #include "ace/Addr.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) class ACE_Export ACE_LSOCK_CODgram : public ACE_SOCK_CODgram, public ACE_LSOCK diff --git a/ace/LSOCK_Connector.h b/ace/LSOCK_Connector.h index 7e3689560bc..dbb29d0b494 100644 --- a/ace/LSOCK_Connector.h +++ b/ace/LSOCK_Connector.h @@ -21,6 +21,10 @@ #include "ace/LSOCK_Stream.h" #include "ace/UNIX_Addr.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) class ACE_Export ACE_LSOCK_Connector : public ACE_SOCK_Connector diff --git a/ace/LSOCK_Dgram.h b/ace/LSOCK_Dgram.h index ea1af4126a8..0c8e87a3ffc 100644 --- a/ace/LSOCK_Dgram.h +++ b/ace/LSOCK_Dgram.h @@ -21,6 +21,10 @@ #include "ace/SOCK_Dgram.h" #include "ace/LSOCK.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) class ACE_Export ACE_LSOCK_Dgram : public ACE_SOCK_Dgram, public ACE_LSOCK diff --git a/ace/LSOCK_Stream.h b/ace/LSOCK_Stream.h index c7242098036..c19d80e261d 100644 --- a/ace/LSOCK_Stream.h +++ b/ace/LSOCK_Stream.h @@ -21,6 +21,10 @@ #include "ace/UNIX_Addr.h" #include "ace/LSOCK.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) class ACE_Export ACE_LSOCK_Stream : public ACE_SOCK_Stream, public ACE_LSOCK diff --git a/ace/Local_Name_Space.h b/ace/Local_Name_Space.h index 2ffdcfe1d09..96c97124896 100644 --- a/ace/Local_Name_Space.h +++ b/ace/Local_Name_Space.h @@ -24,6 +24,10 @@ #include "ace/Malloc_T.h" #include "ace/Synch.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_NS_String { // = TITLE diff --git a/ace/Local_Name_Space_T.h b/ace/Local_Name_Space_T.h index 1c1e437ff83..062a07e8dff 100644 --- a/ace/Local_Name_Space_T.h +++ b/ace/Local_Name_Space_T.h @@ -24,6 +24,10 @@ #include "ace/SString.h" #include "ace/Local_Name_Space.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // A short-hand name for our set of name/value/type tuples passed back // to callers. typedef ACE_Unbounded_Set ACE_WSTRING_SET; diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h index 383d00a63e7..1739e085d9f 100644 --- a/ace/Local_Tokens.h +++ b/ace/Local_Tokens.h @@ -44,6 +44,10 @@ #include "ace/Synch_Options.h" #include "ace/Map_Manager.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // 1. class ACE_Export ACE_TOKEN_CONST { diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h index a41f324a3b7..0114f53df95 100644 --- a/ace/Log_Msg.h +++ b/ace/Log_Msg.h @@ -89,9 +89,13 @@ #include "ace/Log_Record.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (__Lynx__) # undef STDERR -#endif +#endif /* __Lynx__ */ #define ACE_LOG_MSG ACE_Log_Msg::instance () diff --git a/ace/Log_Record.h b/ace/Log_Record.h index 61e22125ec1..0e87de3bf5f 100644 --- a/ace/Log_Record.h +++ b/ace/Log_Record.h @@ -19,6 +19,10 @@ #include "ace/ACE.h" #include "ace/Log_Priority.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if !defined (ACE_LOG_RECORD_H) #define ACE_LOG_RECORD_H diff --git a/ace/Malloc.h b/ace/Malloc.h index dd6cafabf1a..b9a0b6a73e8 100644 --- a/ace/Malloc.h +++ b/ace/Malloc.h @@ -17,10 +17,12 @@ #if !defined (ACE_MALLOC_H) #define ACE_MALLOC_H -#include "ace/ACE.h" - #include "ace/Malloc_Base.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_MALLOC_STATS) #include "ace/Synch_T.h" #if defined (ACE_HAS_THREADS) diff --git a/ace/Malloc_Base.h b/ace/Malloc_Base.h index 3510e1dbd59..69c399df9b6 100644 --- a/ace/Malloc_Base.h +++ b/ace/Malloc_Base.h @@ -17,6 +17,11 @@ #if !defined (ACE_MALLOC_BASE_H) #define ACE_MALLOC_BASE_H +#include "ace/ACE.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ // The definition of this class is located in Malloc.cpp. diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h index 76e48919172..d3d81f8706c 100644 --- a/ace/Malloc_T.h +++ b/ace/Malloc_T.h @@ -22,6 +22,10 @@ #include "ace/Malloc.h" #include "ace/Free_List.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Cached_Mem_Pool_Node { diff --git a/ace/Managed_Object.h b/ace/Managed_Object.h index 0566718159f..1fc19a46376 100644 --- a/ace/Managed_Object.h +++ b/ace/Managed_Object.h @@ -20,6 +20,10 @@ #include "ace/OS.h" #include "ace/Object_Manager.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Cleanup_Adapter : public ACE_Cleanup { diff --git a/ace/Map_Manager.h b/ace/Map_Manager.h index 23512234efd..5416444b95e 100644 --- a/ace/Map_Manager.h +++ b/ace/Map_Manager.h @@ -19,6 +19,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Forward declaration. class ACE_Allocator; diff --git a/ace/Mem_Map.h b/ace/Mem_Map.h index 2dfbfce7c15..86e8f00705b 100644 --- a/ace/Mem_Map.h +++ b/ace/Mem_Map.h @@ -19,6 +19,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Mem_Map { // = TITLE diff --git a/ace/Memory_Pool.h b/ace/Memory_Pool.h index 47990852165..e27d8936a2c 100644 --- a/ace/Memory_Pool.h +++ b/ace/Memory_Pool.h @@ -25,6 +25,10 @@ #include "ace/SV_Semaphore_Complex.h" #endif /* !ACE_WIN32 */ +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if !defined (ACE_LACKS_SBRK) class ACE_Export ACE_Sbrk_Memory_Pool_Options { diff --git a/ace/Message_Block.h b/ace/Message_Block.h index 765fcfca2ca..539101fc248 100644 --- a/ace/Message_Block.h +++ b/ace/Message_Block.h @@ -21,6 +21,10 @@ #include "ace/Malloc.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Forward declaration. class ACE_Data_Block; class ACE_Lock; diff --git a/ace/Message_Block_T.h b/ace/Message_Block_T.h index f182b698df0..cbbc47b7eba 100644 --- a/ace/Message_Block_T.h +++ b/ace/Message_Block_T.h @@ -19,6 +19,10 @@ #include "ace/Message_Block.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Locked_Data_Block : public ACE_Data_Block { diff --git a/ace/Message_Queue.h b/ace/Message_Queue.h index 9b3383ee538..f0176ca291e 100644 --- a/ace/Message_Queue.h +++ b/ace/Message_Queue.h @@ -20,6 +20,10 @@ #include "ace/Message_Block.h" #include "ace/IO_Cntl_Msg.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Forward decls. class ACE_Notification_Strategy; template class ACE_Message_Queue_Iterator; diff --git a/ace/Message_Queue_T.h b/ace/Message_Queue_T.h index aaa775e1fae..f6d91a2ea2f 100644 --- a/ace/Message_Queue_T.h +++ b/ace/Message_Queue_T.h @@ -19,8 +19,12 @@ #include "ace/Synch.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (VXWORKS) - class ACE_Message_Queue_Vx; +class ACE_Message_Queue_Vx; #endif /* defined (VXWORKS) */ template diff --git a/ace/Method_Object.h b/ace/Method_Object.h index 23c5b3a303c..22f6224c349 100644 --- a/ace/Method_Object.h +++ b/ace/Method_Object.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -21,6 +20,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Method_Object { // = TITLE diff --git a/ace/Module.h b/ace/Module.h index 4d28de34fca..8768b5c2bbf 100644 --- a/ace/Module.h +++ b/ace/Module.h @@ -20,6 +20,10 @@ #include "ace/ACE.h" #include "ace/Task_T.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Module_Base { // = TITLE diff --git a/ace/Msg_WFMO_Reactor.h b/ace/Msg_WFMO_Reactor.h index 139577ea500..b168dbf6226 100644 --- a/ace/Msg_WFMO_Reactor.h +++ b/ace/Msg_WFMO_Reactor.h @@ -1,5 +1,6 @@ /* -*- C++ -*- */ // $Id$ + // ============================================================================ // // = LIBRARY @@ -19,6 +20,10 @@ #include "ace/WFMO_Reactor.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_WIN32) class ACE_Export ACE_Msg_WFMO_Reactor : public ACE_WFMO_Reactor diff --git a/ace/Multiplexor.h b/ace/Multiplexor.h index 074601f1890..4b73e1a69fd 100644 --- a/ace/Multiplexor.h +++ b/ace/Multiplexor.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -20,13 +19,16 @@ // // ============================================================================ - #if !defined (ACE_MULTIPLEXOR_H) #define ACE_MULTIPLEXOR_H #include "ace/Module.h" #include "ace/Map_Manager.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_THREADS) #if 0 diff --git a/ace/NT_Service.h b/ace/NT_Service.h index ef1e1562b77..d60d01559af 100644 --- a/ace/NT_Service.h +++ b/ace/NT_Service.h @@ -19,6 +19,10 @@ #include "ace/inc_user_config.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 != 0 #include "ace/Service_Object.h" @@ -129,10 +133,9 @@ protected: SERVICE_STATUS svc_status_; }; - -// These macros help to get things set up correctly at compile time and -// to take most of the grudge work out of creating the proper functions -// and doing the registrations. +// These macros help to get things set up correctly at compile time +// and to take most of the grudge work out of creating the proper +// functions and doing the registrations. // // ACE_NT_SERVICE_DEFINE - defines the 'ServiceMain' function which NT will // call in its own thread when the service control diff --git a/ace/Name_Proxy.h b/ace/Name_Proxy.h index 3227b081f15..11eeec8a44a 100644 --- a/ace/Name_Proxy.h +++ b/ace/Name_Proxy.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -29,6 +28,10 @@ #include "ace/Synch_Options.h" #include "ace/Name_Request_Reply.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Name_Proxy : public ACE_Event_Handler { // = TITLE diff --git a/ace/Name_Request_Reply.h b/ace/Name_Request_Reply.h index 95cd76169f2..e90e75b84ba 100644 --- a/ace/Name_Request_Reply.h +++ b/ace/Name_Request_Reply.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -25,6 +24,10 @@ #include "ace/Time_Value.h" #include "ace/SString.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Name_Request { // = TITLE diff --git a/ace/Name_Space.h b/ace/Name_Space.h index 1b3b0abd887..c81a7d6de2e 100644 --- a/ace/Name_Space.h +++ b/ace/Name_Space.h @@ -22,6 +22,10 @@ #include "ace/Containers.h" #include "ace/Name_Proxy.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + typedef ACE_Unbounded_Set ACE_WSTRING_SET; class ACE_Export ACE_Name_Binding diff --git a/ace/Naming_Context.h b/ace/Naming_Context.h index ddb1b39e54c..5da21a192a6 100644 --- a/ace/Naming_Context.h +++ b/ace/Naming_Context.h @@ -24,6 +24,10 @@ #include "ace/Name_Proxy.h" #include "ace/Name_Space.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Forward decl class ACE_Name_Options; diff --git a/ace/OS.h b/ace/OS.h index 48e7c44e1e2..38ef19e4851 100644 --- a/ace/OS.h +++ b/ace/OS.h @@ -22,6 +22,10 @@ // configuration file (e.g., config-sunos5-sunc++-4.x.h). # include "ace/inc_user_config.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Get OS.h to compile on some of the platforms without DIR info yet. # if !defined (ACE_HAS_DIRENT) typedef int DIR; diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h index 0d10e993ce5..268bf5fe978 100644 --- a/ace/Object_Manager.h +++ b/ace/Object_Manager.h @@ -19,6 +19,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Forward declarations. class ACE_Object_Manager_Preallocations; class ACE_Sig_Adapter; diff --git a/ace/Obstack.h b/ace/Obstack.h index 5e6fb3748b2..0d37fb6cf8d 100644 --- a/ace/Obstack.h +++ b/ace/Obstack.h @@ -19,6 +19,10 @@ #include "ace/Malloc.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Obchunk { // = TITLE diff --git a/ace/Parse_Node.h b/ace/Parse_Node.h index 5fe0781c195..e38bf5f4f50 100644 --- a/ace/Parse_Node.h +++ b/ace/Parse_Node.h @@ -19,6 +19,10 @@ #include "ace/Service_Types.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Parse_Node { // = TITLE diff --git a/ace/Pipe.h b/ace/Pipe.h index 51a07d5bc99..dd210ad6d61 100644 --- a/ace/Pipe.h +++ b/ace/Pipe.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -20,6 +19,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Pipe { // = TITLE diff --git a/ace/Priority_Reactor.h b/ace/Priority_Reactor.h index 9b1d32f58ac..d4d4a672f2f 100644 --- a/ace/Priority_Reactor.h +++ b/ace/Priority_Reactor.h @@ -20,6 +20,10 @@ #include "ace/Containers.h" #include "ace/Select_Reactor.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Priority_Reactor : public ACE_Select_Reactor { // = TITLE diff --git a/ace/Proactor.h b/ace/Proactor.h index 794b60cf49d..a99c704347c 100644 --- a/ace/Proactor.h +++ b/ace/Proactor.h @@ -31,6 +31,10 @@ #include "ace/Free_List.h" #include "ace/Pipe.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \ (defined (ACE_HAS_AIO_CALLS)) // This only works on Win32 platforms and on Unix platforms supporting diff --git a/ace/Process.h b/ace/Process.h index c53d5a65f1a..1004b002945 100644 --- a/ace/Process.h +++ b/ace/Process.h @@ -19,6 +19,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Process_Options { // = TITLE diff --git a/ace/Process_Manager.h b/ace/Process_Manager.h index 6449df5f376..69a31503976 100644 --- a/ace/Process_Manager.h +++ b/ace/Process_Manager.h @@ -20,6 +20,10 @@ #include "ace/Synch.h" #include "ace/Process.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Process_Descriptor { // = TITLE diff --git a/ace/Profile_Timer.h b/ace/Profile_Timer.h index 87abb940c5c..317ecab7faa 100644 --- a/ace/Profile_Timer.h +++ b/ace/Profile_Timer.h @@ -21,6 +21,10 @@ #include "ace/Time_Value.h" #include "ace/High_Res_Timer.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Profile_Timer { // = TITLE diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h index 231a355b376..969396e82b0 100644 --- a/ace/RB_Tree.h +++ b/ace/RB_Tree.h @@ -19,224 +19,220 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class RB_Tree_Node_Base { public: - enum RB_Tree_Node_Color {RED, BLACK}; - }; -// Class Template: RB_Tree_Node -// -// Purpose: Implements a node in a Red-Black Tree ADT -// template class RB_Tree_Node : public RB_Tree_Node_Base { + // = TITLE + // Implements a node in a Red-Black Tree ADT. public: + // Initialization and termination methods. RB_Tree_Node (const KEY &k, const T &t); - // constructor + // Constructor. - ~RB_Tree_Node (); - // destructor + ~RB_Tree_Node (void); + // Destructor. - KEY & key (); - // key accessor + KEY &key (void); + // Key accessor. - T & item (); - // item accessor + T &item (void); + // Item accessor. void color (RB_Tree_Node_Color c); - // set color of the node + // Set color of the node. - RB_Tree_Node_Color color (); - // get color of the node + RB_Tree_Node_Color color (void); + // Get color of the node. - RB_Tree_Node * parent (); - // accessor for node's parent pointer + RB_Tree_Node *parent (void); + // Accessor for node's parent pointer. void parent (RB_Tree_Node * p); - // mutator for node's parent pointer + // Mutator for node's parent pointer. - RB_Tree_Node * left (); - // accessor for node's left child pointer + RB_Tree_Node *left (void); + // Accessor for node's left child pointer. - void left (RB_Tree_Node * l); - // mutator for node's left child pointer + void left (RB_Tree_Node *l); + // Mutator for node's left child pointer. - RB_Tree_Node * right (); - // accessor for node's rightt child pointer + RB_Tree_Node *right (void); + // Accessor for node's right child pointer. void right (RB_Tree_Node * r); - // mutator for node's right child pointer + // Mutator for node's right child pointer private: KEY k_; - // the key + // The key. T t_; - // the item + // The item. RB_Tree_Node_Color color_; - // color of the node + // Color of the node. RB_Tree_Node *parent_; - // pointer to node's parent + // Pointer to node's parent. RB_Tree_Node *left_; - // pointer to node's left child + // Pointer to node's left child. RB_Tree_Node *right_; - // pointer to node's righ child - + // Pointer to node's righ child. }; -// Class Template: RB_Tree -// -// Purpose: Implements a Red-Black Tree ADT, according to -// T. H. Corman, C. E. Leiserson, and R. L. Rivest, -// "Introduction to Algorithms" 1990, MIT, chapter 14 -// template class RB_Tree { + // = TITLE + // Implements a Red-Black Tree ADT, according to T. H. Corman, + // C. E. Leiserson, and R. L. Rivest, "Introduction to Algorithms" + // 1990, MIT, chapter 14 public: - - RB_Tree (); - // constructor + // = Initialization and termination methods. + RB_Tree (void); + // Constructor RB_Tree (const RB_Tree &rbt); - // copy constructor + // copy constructor. - virtual ~RB_Tree (); - // destructor + virtual ~RB_Tree (void); + // Destructor - void operator = (const RB_Tree &rbt); - // assignment operator + void operator= (const RB_Tree &rbt); + // Assignment operator. virtual int lessthan (const KEY &k1, const KEY &k2); - // lessthan comparison function for keys. - // returns 1 if k1 < k2, 0 otherwise + // Lessthan comparison function for keys. returns 1 if k1 < k2, 0 + // otherwise. T* find (const KEY &k); // Returns a pointer to the item corresponding to the // given key, or 0 if it cannot find the key in the tree. T* insert (const KEY &k, const T &t); - // Inserts a *copy* of the key and the item into the tree: - // both the key type KEY and the item type T must have well - // defined semantics for copy construction and < comparison. - // This method returns a pointer to the inserted item copy, - // or 0 if an error occurred. NOTE: if an identical key - // already exists in the tree, no new item is created, and - // the returned pointer addresses the existing item + // Inserts a *copy* of the key and the item into the tree: both the + // key type KEY and the item type T must have well defined semantics + // for copy construction and < comparison. This method returns a + // pointer to the inserted item copy, or 0 if an error occurred. + // NOTE: if an identical key already exists in the tree, no new item + // is created, and the returned pointer addresses the existing item // associated with the existing key. int remove (const KEY &k); - // removes the item associated with the given key from the - // tree and destroys it. Returns 1 if it found the item - // and successfully destroyed it, 0 if it did not find the - // item, or -1 if an error occurred. + // Removes the item associated with the given key from the tree and + // destroys it. Returns 1 if it found the item and successfully + // destroyed it, 0 if it did not find the item, or -1 if an error + // occurred. - void clear (); + void clear (void); // destroys all nodes and sets the root pointer null. -// These could all be made private methods by making the corresponding -// class template instantiations friends, but there are some problems -// with this on certain compilers: leave them all public for now + // These could all be made private methods by making the corresponding + // class template instantiations friends, but there are some problems + // with this on certain compilers: leave them all public for now // private: void RB_rotate_right (RB_Tree_Node * x); - // method for right rotation of the tree about a given node + // Method for right rotation of the tree about a given node. void RB_rotate_left (RB_Tree_Node * x); - // method for left rotation of the tree about a given node + // Method for left rotation of the tree about a given node. void RB_delete_fixup (RB_Tree_Node * x); - // method for restoring Red-Black properties after deletion + // Method for restoring Red-Black properties after deletion. RB_Tree_Node * RB_tree_successor (RB_Tree_Node *x) const; - // method to find the successor node of the given node in the tree + // Method to find the successor node of the given node in the tree. RB_Tree_Node * RB_tree_predecessor (RB_Tree_Node *x) const; - // method to find the predecessor node of the given node in the tree + // Method to find the predecessor node of the given node in the + // tree. RB_Tree_Node * RB_tree_minimum (RB_Tree_Node *x) const; - // method to find the minimum node of the subtree rooted at the given node + // Method to find the minimum node of the subtree rooted at the + // given node. RB_Tree_Node * RB_tree_maximum (RB_Tree_Node *x) const; - // method to find the maximum node of the subtree rooted at the given node + // Method to find the maximum node of the subtree rooted at the + // given node. RB_Tree_Node * find_node (const KEY &k); - // returns a pointer to a matching node if there is one, - // a pointer to the node under which to insert the item - // if the tree is not empty and there is no such match, - // or 0 if the tree is empty. + // Returns a pointer to a matching node if there is one, a pointer + // to the node under which to insert the item if the tree is not + // empty and there is no such match, or 0 if the tree is empty. void RB_rebalance (RB_Tree_Node * x); - // rebalance the tree after insertion of a node + // Rebalance the tree after insertion of a node. // private members RB_Tree_Node *root_; - // the root of the tree - + // The root of the tree. }; -// Class Template: RB_Tree_Iterator -// -// Purpose: Implements an iterator for a Red-Black Tree ADT -// template class RB_Tree_Iterator { + // = TITLE + // Implements an iterator for a Red-Black Tree ADT. public: - + // = Initialization and termination methods. RB_Tree_Iterator (const RB_Tree &tree); - // constructor + // Constructor. - ~RB_Tree_Iterator (); - // destructor + ~RB_Tree_Iterator (void); + // Destructor. - KEY * key (); - // accessor for key of node under iterator (if any) + KEY *key (void); + // Accessor for key of node under iterator (if any). - T * item (); - // accessor for item of node under iterator (if any) + T *item (void); + // Accessor for item of node under iterator (if any). - int first (); - // move to the first item in the tree + int first (void); + // Move to the first item in the tree. - int last (); - // move to the last item in the tree + int last (void); + // Move to the last item in the tree. - int next (); - // move to the next item in the tree + int next (void); + // Move to the next item in the tree. - int previous (); - // move to the previous item in the tree + int previous (void); + // Move to the previous item in the tree. - int is_done (); - // returns 0 if the iterator is positioned over - // a valid RB_Tree node, returns 1 if not + int is_done (void); + // Returns 0 if the iterator is positioned over a valid RB_Tree + // node, returns 1 if not. private: - - // declare private and do not define: explicitly - // prevent assignment and copy construction of iterators + // = Declare private and do not define. + + // Explicitly prevent assignment and copy construction of iterators ACE_UNIMPLEMENTED_FUNC (RB_Tree_Iterator (const RB_Tree_Iterator &)) ACE_UNIMPLEMENTED_FUNC (void operator = (const RB_Tree_Iterator &)) - // private members + // Private members. const RB_Tree &tree_; - // reference to the RB_Tree over which we're iterating + // Reference to the RB_Tree over which we're iterating. RB_Tree_Node *node_; - // pointer to the node currently under the iterator + // Pointer to the node currently under the iterator. }; diff --git a/ace/README b/ace/README index 5c9b01436dd..90dc975b4b4 100644 --- a/ace/README +++ b/ace/README @@ -713,6 +713,7 @@ ACE_LACKS_POSIX_PROTOTYPES Platform lacks POSIX prototypes for certain System V functions like shared memory and message queues. +ACE_LACKS_PRAGMA_ONCE Compiler complains about #pragma once ACE_LACKS_PRI_T Platform lacks pri_t (e.g., Tandem NonStop UNIX). ACE_LACKS_PTHREAD_CANCEL Platform lacks diff --git a/ace/Reactor.h b/ace/Reactor.h index f840b0c6ca3..fcb018ca049 100644 --- a/ace/Reactor.h +++ b/ace/Reactor.h @@ -35,6 +35,10 @@ class ACE_Reactor_Impl; // forward declaration will be useful here #include "ace/Signal.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Reactor { // = TITLE @@ -141,9 +145,9 @@ public: // application wishes to handle events for some fixed amount of // time. // - // Returns the total number of s that were - // dispatched, 0 if the elapsed without dispatching - // any handlers, or -1 if an error occurs. + // Returns the total number of timers and I/O s + // that were dispatched, 0 if the elapsed without + // dispatching any handlers, or -1 if an error occurs. // // The only difference between and // is that in the alertable case, the eventloop will diff --git a/ace/Reactor_Impl.h b/ace/Reactor_Impl.h index 5e42de8e28b..5ecf6961cd6 100644 --- a/ace/Reactor_Impl.h +++ b/ace/Reactor_Impl.h @@ -21,6 +21,10 @@ // declaration will not work #include "ace/Timer_Queue.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Event_Handler.h contains the definition of ACE_Reactor_Mask #include "ace/Event_Handler.h" diff --git a/ace/Read_Buffer.h b/ace/Read_Buffer.h index 25462151cf5..003227f4996 100644 --- a/ace/Read_Buffer.h +++ b/ace/Read_Buffer.h @@ -20,6 +20,10 @@ #include "ace/ACE.h" #include "ace/Malloc.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Read_Buffer { // = TITLE diff --git a/ace/Registry.h b/ace/Registry.h index b19170ca843..00f08008503 100644 --- a/ace/Registry.h +++ b/ace/Registry.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -20,6 +19,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_WIN32) // This only works on Win32 platforms diff --git a/ace/Registry_Name_Space.h b/ace/Registry_Name_Space.h index 29af81695e6..fa558373427 100644 --- a/ace/Registry_Name_Space.h +++ b/ace/Registry_Name_Space.h @@ -19,6 +19,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if (defined (ACE_WIN32) && defined (UNICODE)) // This only works on Win32 platforms when UNICODE is turned on diff --git a/ace/Remote_Name_Space.h b/ace/Remote_Name_Space.h index afc5ce3f414..d96c16bee6a 100644 --- a/ace/Remote_Name_Space.h +++ b/ace/Remote_Name_Space.h @@ -1,8 +1,6 @@ /* -*- C++ -*- */ // $Id$ -/*-*- C++ -*- */ - // ============================================================================ // // = LIBRARY @@ -25,6 +23,10 @@ #include "ace/Name_Proxy.h" #include "ace/Name_Space.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + typedef ACE_Unbounded_Set ACE_WSTRING_SET; class ACE_Export ACE_Remote_Name_Space : public ACE_Name_Space diff --git a/ace/Remote_Tokens.h b/ace/Remote_Tokens.h index 4a2dd9a4450..036ec781815 100644 --- a/ace/Remote_Tokens.h +++ b/ace/Remote_Tokens.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -26,6 +25,10 @@ #include "ace/Local_Tokens.h" #include "ace/Token_Request_Reply.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Remote_Token_Proxy : public ACE_Token_Proxy { // = TITLE diff --git a/ace/SOCK.h b/ace/SOCK.h index 8401326be13..37f33522c5f 100644 --- a/ace/SOCK.h +++ b/ace/SOCK.h @@ -21,6 +21,10 @@ #include "ace/Addr.h" #include "ace/IPC_SAP.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_SOCK : public ACE_IPC_SAP { // = TITLE diff --git a/ace/SOCK_Acceptor.h b/ace/SOCK_Acceptor.h index 7be8f0979bf..ff2f3e2d29f 100644 --- a/ace/SOCK_Acceptor.h +++ b/ace/SOCK_Acceptor.h @@ -20,6 +20,10 @@ #include "ace/SOCK_Stream.h" #include "ace/Time_Value.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_SOCK_Acceptor : public ACE_SOCK { // = TITLE diff --git a/ace/SOCK_CODgram.h b/ace/SOCK_CODgram.h index 757c5a88f53..6a859a1085c 100644 --- a/ace/SOCK_CODgram.h +++ b/ace/SOCK_CODgram.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -21,6 +20,10 @@ #include "ace/SOCK_IO.h" #include "ace/Addr.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_SOCK_CODgram : public ACE_SOCK_IO { // = TITLE diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h index ad0d7a3c8ef..741c61ee578 100644 --- a/ace/SOCK_Connector.h +++ b/ace/SOCK_Connector.h @@ -20,6 +20,10 @@ #include "ace/SOCK_Stream.h" #include "ace/Time_Value.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_SOCK_Connector { // = TITLE diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h index 4b4313c11bc..4f6b903af45 100644 --- a/ace/SOCK_Dgram.h +++ b/ace/SOCK_Dgram.h @@ -20,6 +20,10 @@ #include "ace/SOCK.h" #include "ace/Addr.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_SOCK_Dgram : public ACE_SOCK { // = TITLE diff --git a/ace/SOCK_Dgram_Bcast.h b/ace/SOCK_Dgram_Bcast.h index 64e134b21c9..fc4325b2fde 100644 --- a/ace/SOCK_Dgram_Bcast.h +++ b/ace/SOCK_Dgram_Bcast.h @@ -19,6 +19,10 @@ #include "ace/INET_Addr.h" #include "ace/SOCK_Dgram.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Bcast_Node { public: diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h index 9e592cef445..e3e76cb5985 100644 --- a/ace/SOCK_Dgram_Mcast.h +++ b/ace/SOCK_Dgram_Mcast.h @@ -21,6 +21,10 @@ #include "ace/SOCK_Dgram.h" #include "ace/INET_Addr.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_SOCK_Dgram_Mcast : public ACE_SOCK_Dgram { // = TITLE diff --git a/ace/SOCK_IO.h b/ace/SOCK_IO.h index 589a39b37f3..5342e6bc35d 100644 --- a/ace/SOCK_IO.h +++ b/ace/SOCK_IO.h @@ -19,6 +19,10 @@ #include "ace/SOCK.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_SOCK_IO : public ACE_SOCK { // = TITLE diff --git a/ace/SOCK_Stream.h b/ace/SOCK_Stream.h index d07d332c93f..a6d1706a246 100644 --- a/ace/SOCK_Stream.h +++ b/ace/SOCK_Stream.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -21,6 +20,10 @@ #include "ace/SOCK_IO.h" #include "ace/INET_Addr.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_SOCK_Stream : public ACE_SOCK_IO { // = TITLE diff --git a/ace/SPIPE.h b/ace/SPIPE.h index 9f2b9b6b403..d75f354e071 100644 --- a/ace/SPIPE.h +++ b/ace/SPIPE.h @@ -20,6 +20,10 @@ #include "ace/IPC_SAP.h" #include "ace/SPIPE_Addr.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_SPIPE : public ACE_IPC_SAP { // = TITLE diff --git a/ace/SPIPE_Acceptor.h b/ace/SPIPE_Acceptor.h index 8036c808618..a72dda638cb 100644 --- a/ace/SPIPE_Acceptor.h +++ b/ace/SPIPE_Acceptor.h @@ -22,6 +22,9 @@ #include "ace/Synch.h" #endif /* ACE_WIN32 */ +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_SPIPE_Acceptor : public ACE_SPIPE { diff --git a/ace/SPIPE_Addr.h b/ace/SPIPE_Addr.h index d6277404f37..1dee1121df9 100644 --- a/ace/SPIPE_Addr.h +++ b/ace/SPIPE_Addr.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -17,9 +16,14 @@ #if !defined (ACE_SPIPE_ADDR_H) #define ACE_SPIPE_ADDR_H + #include "ace/Addr.h" #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_SPIPE_Addr : public ACE_Addr { // = TITLE diff --git a/ace/SPIPE_Connector.h b/ace/SPIPE_Connector.h index d9aa7f429f2..f552b0da4e3 100644 --- a/ace/SPIPE_Connector.h +++ b/ace/SPIPE_Connector.h @@ -20,6 +20,10 @@ #include "ace/SPIPE_Stream.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_SPIPE_Connector : public ACE_SPIPE { // = TITLE diff --git a/ace/SPIPE_Stream.h b/ace/SPIPE_Stream.h index 60adbc8fede..55325a0432e 100644 --- a/ace/SPIPE_Stream.h +++ b/ace/SPIPE_Stream.h @@ -20,6 +20,10 @@ #include "ace/SPIPE.h" #include "ace/SPIPE_Addr.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_SPIPE_Stream : public ACE_SPIPE { // = TITLE diff --git a/ace/SString.h b/ace/SString.h index f31f1df3e9b..80f6b4cb302 100644 --- a/ace/SString.h +++ b/ace/SString.h @@ -19,6 +19,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Forward decl. class ACE_Allocator; diff --git a/ace/SV_Message.h b/ace/SV_Message.h index 8939ac8634a..b7f70e66d69 100644 --- a/ace/SV_Message.h +++ b/ace/SV_Message.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -20,6 +19,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_SV_Message { // = TITLE diff --git a/ace/SV_Message_Queue.h b/ace/SV_Message_Queue.h index a1d5ed6b098..caf89378622 100644 --- a/ace/SV_Message_Queue.h +++ b/ace/SV_Message_Queue.h @@ -20,6 +20,10 @@ #include "ace/ACE.h" #include "ace/SV_Message.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_SV_Message_Queue { // = TITLE diff --git a/ace/SV_Semaphore_Complex.h b/ace/SV_Semaphore_Complex.h index b1c7b5bd906..d3c03c357ac 100644 --- a/ace/SV_Semaphore_Complex.h +++ b/ace/SV_Semaphore_Complex.h @@ -19,6 +19,10 @@ #include "ace/SV_Semaphore_Simple.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_SV_Semaphore_Complex : private ACE_SV_Semaphore_Simple { // = TITLE diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h index 6c8a627cf17..aafb08ac8c1 100644 --- a/ace/SV_Semaphore_Simple.h +++ b/ace/SV_Semaphore_Simple.h @@ -19,6 +19,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_SV_Semaphore_Simple { // = TITLE diff --git a/ace/SV_Shared_Memory.h b/ace/SV_Shared_Memory.h index 4ebda2b9c6a..a00a036eb43 100644 --- a/ace/SV_Shared_Memory.h +++ b/ace/SV_Shared_Memory.h @@ -20,6 +20,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_SV_Shared_Memory { // = TITLE diff --git a/ace/Sched_Params.h b/ace/Sched_Params.h index fcae97937f4..c554033dd74 100644 --- a/ace/Sched_Params.h +++ b/ace/Sched_Params.h @@ -22,6 +22,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Sched_Params { // = TITLE diff --git a/ace/Select_Reactor.h b/ace/Select_Reactor.h index 319de07242f..709799e5c97 100644 --- a/ace/Select_Reactor.h +++ b/ace/Select_Reactor.h @@ -19,6 +19,10 @@ #include "ace/Select_Reactor_T.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) #if defined (ACE_SELECT_REACTOR_HAS_DEADLOCK_DETECTION) #include "ace/Local_Tokens.h" diff --git a/ace/Select_Reactor_Base.h b/ace/Select_Reactor_Base.h index a64f8562ccf..82a04e370d6 100644 --- a/ace/Select_Reactor_Base.h +++ b/ace/Select_Reactor_Base.h @@ -25,6 +25,10 @@ #include "ace/Pipe.h" #include "ace/Reactor_Impl.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Add useful typedefs to simplify the following code. typedef void (ACE_Handle_Set::*ACE_FDS_PTMF) (ACE_HANDLE); typedef int (ACE_Event_Handler::*ACE_EH_PTMF) (ACE_HANDLE); diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp index 4ddf2ebeee7..a9edd84973b 100644 --- a/ace/Select_Reactor_T.cpp +++ b/ace/Select_Reactor_T.cpp @@ -859,10 +859,10 @@ ACE_Select_Reactor_T::wait_for_multiple_events (ACE_Se } while (number_of_active_handles == -1 && this->handle_error () > 0); - // @@ Remove?! if (number_of_active_handles > 0) { #if !defined (ACE_WIN32) + // Resynchronize the fd_sets so their "max" is set properly. dispatch_set.rd_mask_.sync (this->handler_rep_.max_handlep1 ()); dispatch_set.wr_mask_.sync (this->handler_rep_.max_handlep1 ()); dispatch_set.ex_mask_.sync (this->handler_rep_.max_handlep1 ()); @@ -875,10 +875,13 @@ ACE_Select_Reactor_T::wait_for_multiple_events (ACE_Se } template int -ACE_Select_Reactor_T::dispatch_timer_handlers (void) +ACE_Select_Reactor_T::dispatch_timer_handlers (int &number_dispatched) { - int number_dispatched = this->timer_queue_->expire (); - return this->state_changed_ ? -1 : number_dispatched; + number_dispatched += this->timer_queue_->expire (); + if (this->state_changed_) + return -1; + else + return 0; } template int @@ -993,6 +996,8 @@ ACE_Select_Reactor_T::dispatch (int number_of_active_h { ACE_TRACE ("ACE_Select_Reactor_T::dispatch"); + int number_of_handlers_dispatched = 0; + // The following do/while loop keeps dispatching as long as there // are still active handles. Note that the only way we should ever // iterate more than once through this loop is if signals occur @@ -1019,14 +1024,13 @@ ACE_Select_Reactor_T::dispatch (int number_of_active_h // Handle timers first since they may have higher latency // constraints. - if (this->dispatch_timer_handlers () == -1) - // State has changed or timer queue has failed, exit inner - // loop. + if (this->dispatch_timer_handlers (number_of_handlers_dispatched) == -1) + // State has changed or timer queue has failed, exit loop. break; - else if (number_of_active_handles <= 0) - // Bail out since we got here since select() was interrupted. { + // Bail out since we got here since select() was + // interrupted. if (ACE_Sig_Handler::sig_pending () != 0) { ACE_Sig_Handler::sig_pending (0); @@ -1046,12 +1050,12 @@ ACE_Select_Reactor_T::dispatch (int number_of_active_h else if (this->dispatch_notification_handlers (number_of_active_handles, dispatch_set) == -1) - break; // State has changed, exit inner loop. + break; // State has changed, exit loop. // Finally, dispatch the I/O handlers. else if (this->dispatch_io_handlers (number_of_active_handles, dispatch_set) == -1) - // State has changed, so exit the inner loop. + // State has changed, so exit loop. break; } while (number_of_active_handles > 0); @@ -1105,7 +1109,8 @@ ACE_Select_Reactor_T::handle_events_i (ACE_Time_Value this->wait_for_multiple_events (dispatch_set, max_wait_time); - result = this->dispatch (number_of_active_handles, dispatch_set); + result = this->dispatch (number_of_active_handles, + dispatch_set); } ACE_SEH_EXCEPT (this->release_token ()) { // As it stands now, we catch and then rethrow all Win32 diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h index d2ccf5f06be..60a478adc41 100644 --- a/ace/Select_Reactor_T.h +++ b/ace/Select_Reactor_T.h @@ -19,8 +19,9 @@ #include "ace/Select_Reactor_Base.h" -// Forward declaration. -//template class ACE_Select_Reactor_T class ACE_Select_Reactor_Token_T : public ACE_SELECT_REACTOR_MUTEX @@ -165,9 +166,9 @@ public: // application wishes to handle events for some fixed amount of // time. // - // Returns the total number of s that were - // dispatched, 0 if the elapsed without dispatching - // any handlers, or -1 if something goes wrong. + // Returns the total number of I/O and Timer s + // that were dispatched, 0 if the elapsed without + // dispatching any handlers, or -1 if something goes wrong. // // Current is identical to // . @@ -529,10 +530,11 @@ protected: // of s that were dispatched or -1 if something // goes wrong. - virtual int dispatch_timer_handlers (void); - // Dispatch any expired timer handlers. Returns -1 if the state of - // the has changed, else returns number of timer - // handlers dispatched. + virtual int dispatch_timer_handlers (int &number_dispatched); + // Dispatch all timer handlers that have expired. Returns -1 if the + // state of the has changed, else 0. + // is set to the number of timer handlers + // dispatched. virtual int dispatch_notification_handlers (int &number_of_active_handles, ACE_Select_Reactor_Handle_Set &dispatch_set); diff --git a/ace/Service_Config.h b/ace/Service_Config.h index 56536a7c163..b6c707f0b76 100644 --- a/ace/Service_Config.h +++ b/ace/Service_Config.h @@ -22,6 +22,10 @@ #include "ace/Containers.h" #include "ace/SString.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Forward decl. class ACE_Service_Repository; class ACE_Service_Type; diff --git a/ace/Service_Manager.h b/ace/Service_Manager.h index a0883c75a63..06505e84a7a 100644 --- a/ace/Service_Manager.h +++ b/ace/Service_Manager.h @@ -23,6 +23,10 @@ #include "ace/INET_Addr.h" #include "ace/Service_Object.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Service_Manager : public ACE_Service_Object { // = TITLE diff --git a/ace/Service_Object.h b/ace/Service_Object.h index acd3719dbfe..485b5396840 100644 --- a/ace/Service_Object.h +++ b/ace/Service_Object.h @@ -20,6 +20,10 @@ #include "ace/Shared_Object.h" #include "ace/Event_Handler.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Service_Object : public ACE_Event_Handler, public ACE_Shared_Object { // = TITLE diff --git a/ace/Service_Repository.h b/ace/Service_Repository.h index db78ef861dc..180e251721d 100644 --- a/ace/Service_Repository.h +++ b/ace/Service_Repository.h @@ -19,6 +19,10 @@ #include "ace/Service_Types.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Service_Repository { // = TITLE diff --git a/ace/Service_Types.h b/ace/Service_Types.h index efe8229b53c..ffd4475b8a0 100644 --- a/ace/Service_Types.h +++ b/ace/Service_Types.h @@ -20,6 +20,10 @@ #include "ace/Service_Object.h" #include "ace/Synch.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Service_Type_Impl { // = TITLE diff --git a/ace/Shared_Memory.h b/ace/Shared_Memory.h index dfec25605c1..af990d016fa 100644 --- a/ace/Shared_Memory.h +++ b/ace/Shared_Memory.h @@ -20,6 +20,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Shared_Memory { // = TITLE diff --git a/ace/Shared_Memory_MM.h b/ace/Shared_Memory_MM.h index ec58b44a2d6..94285dbfad0 100644 --- a/ace/Shared_Memory_MM.h +++ b/ace/Shared_Memory_MM.h @@ -20,6 +20,10 @@ #include "ace/Shared_Memory.h" #include "ace/Mem_Map.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Shared_Memory_MM : public ACE_Shared_Memory { // = TITLE diff --git a/ace/Shared_Memory_SV.h b/ace/Shared_Memory_SV.h index d30f622b9f4..6694b2bcf62 100644 --- a/ace/Shared_Memory_SV.h +++ b/ace/Shared_Memory_SV.h @@ -21,6 +21,10 @@ #include "ace/Shared_Memory.h" #include "ace/SV_Shared_Memory.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Shared_Memory_SV : public ACE_Shared_Memory { // = TITLE diff --git a/ace/Shared_Object.h b/ace/Shared_Object.h index f6699779c9d..b4a14c79649 100644 --- a/ace/Shared_Object.h +++ b/ace/Shared_Object.h @@ -20,6 +20,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Shared_Object { // = TITLE diff --git a/ace/Signal.h b/ace/Signal.h index aef142e6360..541b78e81e9 100644 --- a/ace/Signal.h +++ b/ace/Signal.h @@ -20,6 +20,10 @@ #include "ace/Synch.h" #include "ace/Event_Handler.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // This worksaround a horrible bug with HP/UX C++... typedef struct sigaction ACE_SIGACTION; diff --git a/ace/Singleton.h b/ace/Singleton.h index b4d0a128e6b..91ab3833657 100644 --- a/ace/Singleton.h +++ b/ace/Singleton.h @@ -22,6 +22,10 @@ #include "ace/Synch.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Singleton : public ACE_Cleanup { diff --git a/ace/Stats.h b/ace/Stats.h index e3c192235d2..88388c95575 100644 --- a/ace/Stats.h +++ b/ace/Stats.h @@ -20,6 +20,10 @@ #include "ace/ACE.h" #include "ace/Containers.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Stats_Value { // = TITLE diff --git a/ace/Strategies.h b/ace/Strategies.h index eba011d1d26..9bf57220a11 100644 --- a/ace/Strategies.h +++ b/ace/Strategies.h @@ -19,6 +19,10 @@ #include "ace/Event_Handler.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Forward decls. class ACE_Reactor; diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h index 31ebcfb637f..9b375e9945f 100644 --- a/ace/Strategies_T.h +++ b/ace/Strategies_T.h @@ -24,6 +24,10 @@ #include "ace/Thread_Manager.h" #include "ace/Hash_Map_Manager.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Recycling_Strategy { diff --git a/ace/Stream.h b/ace/Stream.h index e9f4eacc1ad..9dd83e3249b 100644 --- a/ace/Stream.h +++ b/ace/Stream.h @@ -17,14 +17,16 @@ #if !defined (ACE_STREAM_H) #define ACE_STREAM_H -//#include "ace/Multiplexor.h" - #include "ace/ACE.h" #include "ace/IO_Cntl_Msg.h" #include "ace/Message_Block.h" #include "ace/Time_Value.h" #include "ace/Module.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Forward decls. template class ACE_Stream_Iterator; //template class ACE_Module; diff --git a/ace/Stream_Modules.h b/ace/Stream_Modules.h index bacbf28e7ef..7c593608d45 100644 --- a/ace/Stream_Modules.h +++ b/ace/Stream_Modules.h @@ -14,8 +14,13 @@ // // ============================================================================ +// This needs to go outside of the #if !defined() block. Don't ask... #include "ace/Task.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if !defined (ACE_STREAM_MODULES) #define ACE_STREAM_MODULES diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h index fa3ba07eb0e..8fdca0d39e5 100644 --- a/ace/Svc_Conf.h +++ b/ace/Svc_Conf.h @@ -23,6 +23,10 @@ #include "ace/Obstack.h" #include "ace/Service_Config.h" #include "ace/Parse_Node.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (DEBUGGING) #if defined (ACE_YY_DECL) diff --git a/ace/Svc_Handler.h b/ace/Svc_Handler.h index 4bec5635ba8..49153beafa8 100644 --- a/ace/Svc_Handler.h +++ b/ace/Svc_Handler.h @@ -24,6 +24,10 @@ class ACE_Connection_Recycling_Strategy; #include "ace/Task.h" #include "ace/Service_Config.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Svc_Handler : public ACE_Task { diff --git a/ace/Synch.h b/ace/Synch.h index 03587d5820f..514628cf4eb 100644 --- a/ace/Synch.h +++ b/ace/Synch.h @@ -21,6 +21,11 @@ #define ACE_SYNCH_H #include "ace/ACE.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if !(defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM)) #include "ace/SV_Semaphore_Complex.h" #endif /* !(defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM)) */ diff --git a/ace/Synch_Options.h b/ace/Synch_Options.h index cb0d8f09964..fbcadb95748 100644 --- a/ace/Synch_Options.h +++ b/ace/Synch_Options.h @@ -19,6 +19,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Synch_Options { // = TITLE diff --git a/ace/Synch_T.h b/ace/Synch_T.h index f0767dc5ebd..fce5025c447 100644 --- a/ace/Synch_T.h +++ b/ace/Synch_T.h @@ -17,6 +17,10 @@ #if !defined (ACE_SYNCH_T_H) #define ACE_SYNCH_T_H +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Event_Handler.h" #include "ace/Synch.h" diff --git a/ace/System_Time.h b/ace/System_Time.h index a84a22fd8de..b288d6872bb 100644 --- a/ace/System_Time.h +++ b/ace/System_Time.h @@ -22,6 +22,10 @@ #include "ace/Memory_Pool.h" #include "ace/Malloc_T.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Date_Time { // = TITLE diff --git a/ace/TLI.h b/ace/TLI.h index 7756ac14753..d63dc67ac9f 100644 --- a/ace/TLI.h +++ b/ace/TLI.h @@ -21,6 +21,10 @@ #include "ace/IPC_SAP.h" #include "ace/Addr.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_TLI) // There's not a universal device name for TLI devices. If the platform diff --git a/ace/TLI_Acceptor.h b/ace/TLI_Acceptor.h index 5250a0cef70..5d3913f14ff 100644 --- a/ace/TLI_Acceptor.h +++ b/ace/TLI_Acceptor.h @@ -22,6 +22,10 @@ #include "ace/Time_Value.h" #include "ace/TLI_Stream.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_TLI) // Forward reference... diff --git a/ace/TLI_Connector.h b/ace/TLI_Connector.h index 065aee6a791..7a9830fa9f4 100644 --- a/ace/TLI_Connector.h +++ b/ace/TLI_Connector.h @@ -19,6 +19,10 @@ #include "ace/TLI_Stream.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_TLI) class ACE_Export ACE_TLI_Connector : public ACE_TLI diff --git a/ace/TLI_Stream.h b/ace/TLI_Stream.h index 9799e500c9b..a9badd58820 100644 --- a/ace/TLI_Stream.h +++ b/ace/TLI_Stream.h @@ -21,6 +21,10 @@ #include "ace/TLI.h" #include "ace/INET_Addr.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_TLI) class ACE_Export ACE_TLI_Stream : public ACE_TLI diff --git a/ace/TP_Reactor.h b/ace/TP_Reactor.h index 25047e4bac5..7f4bab25121 100644 --- a/ace/TP_Reactor.h +++ b/ace/TP_Reactor.h @@ -19,6 +19,10 @@ #include "ace/Select_Reactor.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_EH_Dispatch_Info { // = TITLE diff --git a/ace/TTY_IO.h b/ace/TTY_IO.h index 678f1ce0ff7..e1f334315b3 100644 --- a/ace/TTY_IO.h +++ b/ace/TTY_IO.h @@ -16,14 +16,18 @@ // // ============================================================================ -#if !defined (ACE_TTY_H) -#define ACE_TTY_H +#if !defined (ACE_TTY_IO_H) +#define ACE_TTY_IO_H #include "ace/OS.h" #include "ace/DEV_Addr.h" #include "ace/DEV_Connector.h" #include "ace/DEV_IO.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_TTY_IO : public ACE_DEV_IO { // = TITLE @@ -64,4 +68,4 @@ public: #endif /* ACE_NEEDS_DEV_IO_CONVERSION */ }; -#endif /* ACE_TTY_H */ +#endif /* ACE_TTY_IO_H */ diff --git a/ace/Task.h b/ace/Task.h index 4ea22b4e9ab..764e3409702 100644 --- a/ace/Task.h +++ b/ace/Task.h @@ -20,6 +20,10 @@ #include "ace/Service_Object.h" #include "ace/Thread_Manager.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Task_Flags { public: diff --git a/ace/Task_T.h b/ace/Task_T.h index 09d6ed3bf62..2e17069219a 100644 --- a/ace/Task_T.h +++ b/ace/Task_T.h @@ -21,6 +21,10 @@ #include "ace/Synch_T.h" #include "ace/Task.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Forward decls... template class ACE_Module; diff --git a/ace/Thread.h b/ace/Thread.h index c5b028c1360..e90762a8466 100644 --- a/ace/Thread.h +++ b/ace/Thread.h @@ -19,6 +19,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Thread { // = TITLE diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h index 3be630f7e48..d896f5b51ec 100644 --- a/ace/Thread_Manager.h +++ b/ace/Thread_Manager.h @@ -22,6 +22,10 @@ #include "ace/Containers.h" #include "ace/Free_List.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // The following macros control how a Thread Manager manages a pool of // Thread_Descriptor. Currently, the default behavior is not to // preallocate any thread descriptor and never (well, almost never) diff --git a/ace/Time_Request_Reply.h b/ace/Time_Request_Reply.h index 01998e3b700..087c236bbc8 100644 --- a/ace/Time_Request_Reply.h +++ b/ace/Time_Request_Reply.h @@ -25,6 +25,10 @@ #include "ace/Time_Value.h" #include "ace/SString.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Time_Request { // = TITLE diff --git a/ace/Time_Value.h b/ace/Time_Value.h index 53a46b9244a..05c2c8a74e1 100644 --- a/ace/Time_Value.h +++ b/ace/Time_Value.h @@ -22,4 +22,8 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #endif /* ACE_TIME_VALUE */ diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h index 0f2cd22ec1a..950e83059f9 100644 --- a/ace/Timeprobe.h +++ b/ace/Timeprobe.h @@ -5,6 +5,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_ENABLE_TIMEPROBES) #if !defined (ACE_COMPILE_TIMEPROBES) #define ACE_COMPILE_TIMEPROBES diff --git a/ace/Timeprobe_T.h b/ace/Timeprobe_T.h index 66852fe3f92..2bb4a96eec2 100644 --- a/ace/Timeprobe_T.h +++ b/ace/Timeprobe_T.h @@ -5,6 +5,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_COMPILE_TIMEPROBES) #include "ace/Containers.h" diff --git a/ace/Timer_Hash.h b/ace/Timer_Hash.h index afd1ddc3c7d..95a0f93a5b9 100644 --- a/ace/Timer_Hash.h +++ b/ace/Timer_Hash.h @@ -21,6 +21,11 @@ #include "ace/Timer_Hash_T.h" #include "ace/Timer_Heap_T.h" #include "ace/Timer_List_T.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // The following typedef are here for ease of use typedef ACE_Timer_Hash_Upcall class ACE_Timer_Hash_T; diff --git a/ace/Timer_Heap.h b/ace/Timer_Heap.h index 46132a49ef8..b3ac06d50f2 100644 --- a/ace/Timer_Heap.h +++ b/ace/Timer_Heap.h @@ -19,6 +19,10 @@ #include "ace/Timer_Heap_T.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // The following typedef are here for ease of use and backward // compatibility. diff --git a/ace/Timer_Heap_T.h b/ace/Timer_Heap_T.h index 11d4cf781b9..32150de7647 100644 --- a/ace/Timer_Heap_T.h +++ b/ace/Timer_Heap_T.h @@ -21,6 +21,10 @@ #include "ace/Free_List.h" #include "ace/Containers.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Forward declaration template class ACE_Timer_Heap_T; diff --git a/ace/Timer_List.h b/ace/Timer_List.h index 1212985b4b2..290c5d78a01 100644 --- a/ace/Timer_List.h +++ b/ace/Timer_List.h @@ -19,6 +19,10 @@ #include "ace/Timer_List_T.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // The following typedef are here for ease of use and backward // compatibility. diff --git a/ace/Timer_List_T.h b/ace/Timer_List_T.h index e03e1cb5f2e..fa593d1642b 100644 --- a/ace/Timer_List_T.h +++ b/ace/Timer_List_T.h @@ -19,6 +19,10 @@ #include "ace/Timer_Queue_T.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Forward declaration. template class ACE_Timer_List_T; diff --git a/ace/Timer_Queue.h b/ace/Timer_Queue.h index cf2840ddf26..288c921d5fb 100644 --- a/ace/Timer_Queue.h +++ b/ace/Timer_Queue.h @@ -21,6 +21,10 @@ #include "ace/Synch.h" #include "ace/Timer_Queue_T.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // The following typedef are here for ease of use and backward // compatibility. diff --git a/ace/Timer_Queue_Adapters.h b/ace/Timer_Queue_Adapters.h index 9bae72c1471..95c3a6aec6f 100644 --- a/ace/Timer_Queue_Adapters.h +++ b/ace/Timer_Queue_Adapters.h @@ -20,6 +20,10 @@ # include "ace/Task.h" # include "ace/Signal.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Export ACE_Async_Timer_Queue_Adapter : public ACE_Event_Handler { diff --git a/ace/Timer_Queue_T.h b/ace/Timer_Queue_T.h index d0e481b4d29..e17abb7c86c 100644 --- a/ace/Timer_Queue_T.h +++ b/ace/Timer_Queue_T.h @@ -20,6 +20,10 @@ #include "ace/Free_List.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Timer_Node_T { diff --git a/ace/Timer_Wheel.h b/ace/Timer_Wheel.h index c3e3908306d..e618957ce19 100644 --- a/ace/Timer_Wheel.h +++ b/ace/Timer_Wheel.h @@ -20,6 +20,10 @@ #include "ace/Timer_Wheel_T.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // The following typedef are here for ease of use and backward // compatibility. diff --git a/ace/Timer_Wheel_T.h b/ace/Timer_Wheel_T.h index 88e131b1faf..25e717825bd 100644 --- a/ace/Timer_Wheel_T.h +++ b/ace/Timer_Wheel_T.h @@ -20,6 +20,10 @@ #include "ace/Timer_Queue_T.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Forward declaration template class ACE_Timer_Wheel_T; diff --git a/ace/Token.h b/ace/Token.h index a9e6db598bc..437b549f5aa 100644 --- a/ace/Token.h +++ b/ace/Token.h @@ -20,6 +20,10 @@ #include "ace/Synch.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_THREADS) #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || defined (VXWORKS) || defined (ACE_PSOS) diff --git a/ace/Token_Collection.h b/ace/Token_Collection.h index a5103152f46..10a60de017f 100644 --- a/ace/Token_Collection.h +++ b/ace/Token_Collection.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -32,6 +31,10 @@ #include "ace/Local_Tokens.h" #include "ace/SString.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Token_Collection : public ACE_Token_Proxy { // = TITLE diff --git a/ace/Token_Invariants.h b/ace/Token_Invariants.h index 743b5155ad4..f5dc8bebed2 100644 --- a/ace/Token_Invariants.h +++ b/ace/Token_Invariants.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ============================================================================ // // = LIBRARY @@ -27,6 +26,10 @@ #include "ace/Map_Manager.h" #include "ace/Local_Tokens.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Mutex_Invariants { // = TITLE diff --git a/ace/Token_Manager.h b/ace/Token_Manager.h index 381c47d3f39..13f12b4e657 100644 --- a/ace/Token_Manager.h +++ b/ace/Token_Manager.h @@ -21,6 +21,10 @@ #include "ace/Map_Manager.h" #include "ace/Local_Tokens.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Local_Mutex; class ACE_Mutex_Token; diff --git a/ace/Token_Request_Reply.h b/ace/Token_Request_Reply.h index c11ef24fba2..9c201bfed3c 100644 --- a/ace/Token_Request_Reply.h +++ b/ace/Token_Request_Reply.h @@ -26,6 +26,10 @@ #include "ace/Local_Tokens.h" #include "ace/Time_Value.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Token_Request { // = TITLE diff --git a/ace/Typed_SV_Message.h b/ace/Typed_SV_Message.h index 5dd44314bb7..f85186ccd48 100644 --- a/ace/Typed_SV_Message.h +++ b/ace/Typed_SV_Message.h @@ -20,6 +20,10 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Typed_SV_Message { diff --git a/ace/Typed_SV_Message_Queue.h b/ace/Typed_SV_Message_Queue.h index a59b3320152..e9a94867285 100644 --- a/ace/Typed_SV_Message_Queue.h +++ b/ace/Typed_SV_Message_Queue.h @@ -21,6 +21,10 @@ #include "ace/SV_Message_Queue.h" #include "ace/Typed_SV_Message.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template class ACE_Typed_SV_Message_Queue { diff --git a/ace/UNIX_Addr.h b/ace/UNIX_Addr.h index ac39c4aa9a7..5bee7b4f3df 100644 --- a/ace/UNIX_Addr.h +++ b/ace/UNIX_Addr.h @@ -16,8 +16,13 @@ #if !defined (ACE_UNIX_ADDR_H) #define ACE_UNIX_ADDR_H + #include "ace/Addr.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) class ACE_Export ACE_UNIX_Addr : public ACE_Addr diff --git a/ace/UPIPE_Acceptor.h b/ace/UPIPE_Acceptor.h index c3deffdda63..576646a4407 100644 --- a/ace/UPIPE_Acceptor.h +++ b/ace/UPIPE_Acceptor.h @@ -23,6 +23,10 @@ #include "ace/SPIPE_Acceptor.h" #include "ace/Thread_Manager.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_THREADS) class ACE_Export ACE_UPIPE_Acceptor : public ACE_SPIPE_Acceptor diff --git a/ace/UPIPE_Addr.h b/ace/UPIPE_Addr.h index 1eadd334b93..fcdf59e54a8 100644 --- a/ace/UPIPE_Addr.h +++ b/ace/UPIPE_Addr.h @@ -20,6 +20,10 @@ #include "ace/SPIPE_Addr.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + typedef ACE_SPIPE_Addr ACE_UPIPE_Addr; #if 0 diff --git a/ace/UPIPE_Connector.h b/ace/UPIPE_Connector.h index c5c23c1d327..de2e5fa2c63 100644 --- a/ace/UPIPE_Connector.h +++ b/ace/UPIPE_Connector.h @@ -21,6 +21,10 @@ #include "ace/Synch.h" #include "ace/SPIPE_Stream.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_THREADS) class ACE_Export ACE_UPIPE_Connector : public ACE_SPIPE diff --git a/ace/UPIPE_Stream.h b/ace/UPIPE_Stream.h index d6a9726bf40..53921bca065 100644 --- a/ace/UPIPE_Stream.h +++ b/ace/UPIPE_Stream.h @@ -23,6 +23,10 @@ #include "ace/Message_Queue.h" #include "ace/UPIPE_Addr.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_THREADS) // Use a typedef to make life easier later on. diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h index a8c1373a530..59ba69b971d 100644 --- a/ace/WFMO_Reactor.h +++ b/ace/WFMO_Reactor.h @@ -24,6 +24,10 @@ #include "ace/Reactor_Impl.h" #include "ace/Message_Queue.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Forward decl. class ACE_WFMO_Reactor; class ACE_Handle_Set; @@ -574,9 +578,9 @@ public: // // is used as the demultiplexing call // - // Returns the total number of s that were - // dispatched, 0 if the elapsed without dispatching - // any handlers, or -1 if an error occurs. + // Returns the total number of I/O and timer s + // that were dispatched, 0 if the elapsed without + // dispatching any handlers, or -1 if an error occurs. // // The only difference between and // is that in the alertable case, TRUE is passed to diff --git a/ace/XtReactor.h b/ace/XtReactor.h index 58ef2878bf1..97ae17c98b6 100644 --- a/ace/XtReactor.h +++ b/ace/XtReactor.h @@ -21,6 +21,10 @@ #include "ace/Select_Reactor.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_XT) //#define String XtString diff --git a/ace/inc_user_config.h b/ace/inc_user_config.h index b4f37aaef77..1eae8695807 100644 --- a/ace/inc_user_config.h +++ b/ace/inc_user_config.h @@ -9,6 +9,10 @@ #include "ace/config.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // By default, DO include RCS Id strings in object code. #if ! defined (ACE_USE_RCSID) # define ACE_USE_RCSID 1 diff --git a/ace/iosfwd.h b/ace/iosfwd.h index bb9d3d0f2fb..789cdbb2a53 100644 --- a/ace/iosfwd.h +++ b/ace/iosfwd.h @@ -29,6 +29,10 @@ #include "ace/inc_user_config.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) #if !defined (ACE_USES_OLD_IOSTREAMS) diff --git a/ace/streams.h b/ace/streams.h index 3297e722095..bf585a7cfbc 100644 --- a/ace/streams.h +++ b/ace/streams.h @@ -26,6 +26,10 @@ #include "ace/inc_user_config.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) #if defined (_MSC_VER) -- cgit v1.2.1