diff options
28 files changed, 66 insertions, 41 deletions
diff --git a/ChangeLog b/ChangeLog index 83dc57e6a49..7b5e865f3a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,33 @@ +Thu Jun 10 18:41:29 2004 Steve Huston <shuston@riverace.com> + + * apps/JAWS3/jaws3/Asynch_IO.cpp: + * apps/JAWS3/jaws3/IO.h: + * apps/JAWS3/jaws3/Config_File.cpp: + * apps/JAWS3/jaws3/Datagram.h: + * apps/JAWS3/jaws3/Export.h: + * apps/JAWS3/jaws3/Options.cpp: + * apps/JAWS3/jaws3/Protocol_Handler.h: + * apps/JAWS3/jaws3/Symbol_Table.h + * apps/JAWS3/jaws3/Synch_IO.cpp: + * apps/JAWS3/jaws3/THYBRID_Concurrency.cpp: + * apps/JAWS3/jaws3/TPOOL_Concurrency.cpp: + * apps/JAWS3/jaws3/TPR_Concurrency.cpp: + * apps/JAWS3/jaws3/Task_Timer.h: + * apps/JAWS3/jaws3/Templates.cpp: + * apps/JAWS3/jaws3/Timer.h: + * apps/JAWS3/jaws3/Timer_Helpers.h: + * examples/APG/Misc_IPC/UDP_Broadcast.cpp: + * examples/APG/Misc_IPC/UDP_Multicast.cpp: + * examples/APG/Misc_IPC/UDP_Unicast.cpp: + * examples/APG/Shared_Memory/Mem_Map.cpp: + * examples/APG/Svc_Config/HA_Configurable_Server_Dynamic.cpp: + * examples/APG/Svc_Config/HA_Configurable_Server_Static.cpp: + * examples/APG/Svc_Config/HA_Status_Dynamic.cpp: + * examples/APG/Svc_Config/HA_Status_Static.cpp: + * examples/APG/ThreadManagement/Async_Cancel.cpp: + Don't include "ace/OS.h" - it screws up HP aC++ and somehow starts + complaining about mismatched t_bind things in OS_TLI.inl. Weird. + Thu Jun 10 19:41:02 2004 Olli Savia <ops@iki.fi> * ACE-INSTALL.html: diff --git a/apps/JAWS3/jaws3/Asynch_IO.cpp b/apps/JAWS3/jaws3/Asynch_IO.cpp index eafc5b6306f..811c3d88a6f 100644 --- a/apps/JAWS3/jaws3/Asynch_IO.cpp +++ b/apps/JAWS3/jaws3/Asynch_IO.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "ace/OS.h" - #ifndef JAWS_BUILD_DLL #define JAWS_BUILD_DLL #endif /*JAWS_BUILD_DLL*/ +#include "ace/config-lite.h" + #include "jaws3/IO.h" #include "jaws3/Asynch_IO.h" #include "jaws3/Event_Completer.h" diff --git a/apps/JAWS3/jaws3/Config_File.cpp b/apps/JAWS3/jaws3/Config_File.cpp index bc324ce0484..5793aa60dc5 100644 --- a/apps/JAWS3/jaws3/Config_File.cpp +++ b/apps/JAWS3/jaws3/Config_File.cpp @@ -1,6 +1,7 @@ // $Id$ -#include "ace/OS.h" +#include "ace/OS_NS_stdlib.h" +#include "ace/OS_NS_string.h" #include "ace/FILE_Connector.h" #include "ace/Message_Block.h" #include "ace/Singleton.h" diff --git a/apps/JAWS3/jaws3/Datagram.h b/apps/JAWS3/jaws3/Datagram.h index e0ff0c6f1a9..370088892de 100644 --- a/apps/JAWS3/jaws3/Datagram.h +++ b/apps/JAWS3/jaws3/Datagram.h @@ -4,7 +4,6 @@ #ifndef JAWS_DATAGRAM_H #define JAWS_DATAGRAM_H -#include "ace/OS.h" #include "ace/Addr.h" #include "ace/Synch.h" #include "ace/Singleton.h" diff --git a/apps/JAWS3/jaws3/Export.h b/apps/JAWS3/jaws3/Export.h index 22e3c7b61f7..8af831df529 100644 --- a/apps/JAWS3/jaws3/Export.h +++ b/apps/JAWS3/jaws3/Export.h @@ -7,7 +7,7 @@ #ifndef JAWS_EXPORT_H #define JAWS_EXPORT_H -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/apps/JAWS3/jaws3/IO.h b/apps/JAWS3/jaws3/IO.h index 9c71702105b..a910a4fb029 100644 --- a/apps/JAWS3/jaws3/IO.h +++ b/apps/JAWS3/jaws3/IO.h @@ -4,7 +4,6 @@ #ifndef JAWS_IO_H #define JAWS_IO_H -#include "ace/OS.h" #include "ace/Message_Block.h" #include "ace/Singleton.h" #include "ace/Synch_Traits.h" diff --git a/apps/JAWS3/jaws3/Options.cpp b/apps/JAWS3/jaws3/Options.cpp index 6ba0ed82fe7..19c7a40406e 100644 --- a/apps/JAWS3/jaws3/Options.cpp +++ b/apps/JAWS3/jaws3/Options.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ace/OS.h" +#include "ace/OS_NS_stdlib.h" #ifndef JAWS_BUILD_DLL #define JAWS_BUILD_DLL diff --git a/apps/JAWS3/jaws3/Protocol_Handler.h b/apps/JAWS3/jaws3/Protocol_Handler.h index 663a3eda032..5452d4e0247 100644 --- a/apps/JAWS3/jaws3/Protocol_Handler.h +++ b/apps/JAWS3/jaws3/Protocol_Handler.h @@ -2,7 +2,6 @@ #ifndef JAWS_PROTOCOL_HANDLER_H #define JAWS_PROTOCOL_HANDLER_H -#include "ace/OS.h" #include "ace/Message_Block.h" #include "jaws3/Export.h" diff --git a/apps/JAWS3/jaws3/Signal_Task.cpp b/apps/JAWS3/jaws3/Signal_Task.cpp index 00c3f557692..24c79eec032 100644 --- a/apps/JAWS3/jaws3/Signal_Task.cpp +++ b/apps/JAWS3/jaws3/Signal_Task.cpp @@ -1,6 +1,7 @@ // $Id$ -#include "ace/OS.h" +#include "ace/OS_NS_signal.h" +#include "ace/OS_NS_Thread.h" #include "ace/Thread.h" #ifndef JAWS_BUILD_DLL diff --git a/apps/JAWS3/jaws3/Symbol_Table.h b/apps/JAWS3/jaws3/Symbol_Table.h index 67c6ebf5d18..dfd856205e3 100644 --- a/apps/JAWS3/jaws3/Symbol_Table.h +++ b/apps/JAWS3/jaws3/Symbol_Table.h @@ -4,7 +4,6 @@ #ifndef JAWS_SYMBOL_TABLE_H #define JAWS_SYMBOL_TABLE_H -#include "ace/OS.h" #include "ace/Hash_Map_Manager.h" #include "ace/Synch.h" diff --git a/apps/JAWS3/jaws3/Synch_IO.cpp b/apps/JAWS3/jaws3/Synch_IO.cpp index 76f53dc0e0b..69b0d92fd95 100644 --- a/apps/JAWS3/jaws3/Synch_IO.cpp +++ b/apps/JAWS3/jaws3/Synch_IO.cpp @@ -1,6 +1,5 @@ // $Id$ -#include "ace/OS.h" #include "ace/ACE.h" #ifndef JAWS_BUILD_DLL diff --git a/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp b/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp index d42a7b47018..83c3da28bc7 100644 --- a/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp +++ b/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ace/OS.h" +#include "ace/OS_NS_stdlib.h" #include "ace/Message_Block.h" #ifndef JAWS_BUILD_DLL diff --git a/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp b/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp index c048b6a647d..4f91c5f34c8 100644 --- a/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp +++ b/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ace/OS.h" +#include "ace/OS_NS_stdlib.h" #include "ace/Message_Block.h" #ifndef JAWS_BUILD_DLL diff --git a/apps/JAWS3/jaws3/TPR_Concurrency.cpp b/apps/JAWS3/jaws3/TPR_Concurrency.cpp index 6f07a6479cc..6e15def5cb8 100644 --- a/apps/JAWS3/jaws3/TPR_Concurrency.cpp +++ b/apps/JAWS3/jaws3/TPR_Concurrency.cpp @@ -1,6 +1,5 @@ // $Id$ -#include "ace/OS.h" #include "ace/Message_Block.h" #ifndef JAWS_BUILD_DLL diff --git a/apps/JAWS3/jaws3/Task_Timer.h b/apps/JAWS3/jaws3/Task_Timer.h index 08e1804e1c2..a31781a922a 100644 --- a/apps/JAWS3/jaws3/Task_Timer.h +++ b/apps/JAWS3/jaws3/Task_Timer.h @@ -4,7 +4,6 @@ #ifndef JAWS_TASK_TIMER_H #define JAWS_TASK_TIMER_H -#include "ace/OS.h" #include "ace/Singleton.h" #include "ace/Timer_Wheel.h" #include "ace/Timer_Queue_Adapters.h" diff --git a/apps/JAWS3/jaws3/Templates.cpp b/apps/JAWS3/jaws3/Templates.cpp index 47eb80eb203..32bd4642109 100644 --- a/apps/JAWS3/jaws3/Templates.cpp +++ b/apps/JAWS3/jaws3/Templates.cpp @@ -1,6 +1,5 @@ // $Id$ -#include "ace/OS.h" #include "ace/Reactor.h" #include "ace/Select_Reactor.h" #include "ace/Svc_Handler.h" diff --git a/apps/JAWS3/jaws3/Timer.h b/apps/JAWS3/jaws3/Timer.h index 32c4abc8007..d2468344307 100644 --- a/apps/JAWS3/jaws3/Timer.h +++ b/apps/JAWS3/jaws3/Timer.h @@ -4,7 +4,6 @@ #ifndef JAWS_TIMER_H #define JAWS_TIMER_H -#include "ace/OS.h" #include "ace/Singleton.h" #include "ace/Timer_Wheel.h" #include "ace/Timer_Queue_Adapters.h" diff --git a/apps/JAWS3/jaws3/Timer_Helpers.h b/apps/JAWS3/jaws3/Timer_Helpers.h index a88aa68285d..9ce8434975f 100644 --- a/apps/JAWS3/jaws3/Timer_Helpers.h +++ b/apps/JAWS3/jaws3/Timer_Helpers.h @@ -4,7 +4,6 @@ #ifndef JAWS_TIMER_HELPERS_H #define JAWS_TIMER_HELPERS_H -#include "ace/OS.h" #include "ace/Singleton.h" #include "ace/Event_Handler.h" diff --git a/apps/JAWS3/jaws3/main.cpp b/apps/JAWS3/jaws3/main.cpp index e93e1d95cdd..4b5705abc2f 100644 --- a/apps/JAWS3/jaws3/main.cpp +++ b/apps/JAWS3/jaws3/main.cpp @@ -1,5 +1,5 @@ // $Id$ -#include "ace/OS.h" +#include "ace/Log_Msg.h" #include "ace/Reactor.h" #include "ace/Select_Reactor.h" #include "ace/Service_Config.h" diff --git a/examples/APG/Misc_IPC/UDP_Broadcast.cpp b/examples/APG/Misc_IPC/UDP_Broadcast.cpp index 8f3fe58c1b5..69e342b6f15 100644 --- a/examples/APG/Misc_IPC/UDP_Broadcast.cpp +++ b/examples/APG/Misc_IPC/UDP_Broadcast.cpp @@ -6,7 +6,7 @@ */ // Listing 1 code/ch09 -#include "ace/OS.h" +#include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Dgram_Bcast.h" @@ -17,7 +17,7 @@ int send_broadcast (u_short to_port) ACE_INET_Addr my_addr (ACE_static_cast (u_short, 10101)); ACE_SOCK_Dgram_Bcast udp (my_addr); ssize_t sent = udp.send (message, - ACE_OS_String::strlen (message) + 1, + ACE_OS::strlen (message) + 1, to_port); udp.close (); if (sent == -1) diff --git a/examples/APG/Misc_IPC/UDP_Multicast.cpp b/examples/APG/Misc_IPC/UDP_Multicast.cpp index a21b02efc69..feb2baafc57 100644 --- a/examples/APG/Misc_IPC/UDP_Multicast.cpp +++ b/examples/APG/Misc_IPC/UDP_Multicast.cpp @@ -6,7 +6,7 @@ */ // Listing 1 code/ch09 -#include "ace/OS.h" +#include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Dgram_Mcast.h" @@ -20,7 +20,7 @@ int send_multicast (const ACE_INET_Addr &mcast_addr) ACE_TEXT ("join")), -1); ssize_t sent = udp.send (message, - ACE_OS_String::strlen (message) + 1); + ACE_OS::strlen (message) + 1); udp.close (); if (sent == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), diff --git a/examples/APG/Misc_IPC/UDP_Unicast.cpp b/examples/APG/Misc_IPC/UDP_Unicast.cpp index 6a6c6f6a2e4..909ff175978 100644 --- a/examples/APG/Misc_IPC/UDP_Unicast.cpp +++ b/examples/APG/Misc_IPC/UDP_Unicast.cpp @@ -6,7 +6,7 @@ */ // Listing 1 code/ch09 -#include "ace/OS.h" +#include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Dgram.h" @@ -17,7 +17,7 @@ int send_unicast (const ACE_INET_Addr &to) ACE_INET_Addr my_addr (ACE_static_cast (u_short, 10101)); ACE_SOCK_Dgram udp (my_addr); ssize_t sent = udp.send (message, - ACE_OS_String::strlen (message) + 1, + ACE_OS::strlen (message) + 1, to); udp.close (); if (sent == -1) diff --git a/examples/APG/Shared_Memory/Mem_Map.cpp b/examples/APG/Shared_Memory/Mem_Map.cpp index fe1b87f9cee..c96cd0b0f45 100644 --- a/examples/APG/Shared_Memory/Mem_Map.cpp +++ b/examples/APG/Shared_Memory/Mem_Map.cpp @@ -1,6 +1,7 @@ // $Id$ -#include "ace/OS.h" +#include "ace/OS_NS_fcntl.h" +#include "ace/OS_NS_string.h" #include "ace/Mem_Map.h" #include "ace/Log_Msg.h" diff --git a/examples/APG/Svc_Config/HA_Configurable_Server_Dynamic.cpp b/examples/APG/Svc_Config/HA_Configurable_Server_Dynamic.cpp index 249c49cdb91..4470396f156 100644 --- a/examples/APG/Svc_Config/HA_Configurable_Server_Dynamic.cpp +++ b/examples/APG/Svc_Config/HA_Configurable_Server_Dynamic.cpp @@ -1,7 +1,7 @@ // $Id$ // Listing 1 code/ch19 -#include "ace/OS.h" +#include "ace/OS_main.h" #include "ace/Service_Config.h" #include "ace/Reactor.h" diff --git a/examples/APG/Svc_Config/HA_Configurable_Server_Static.cpp b/examples/APG/Svc_Config/HA_Configurable_Server_Static.cpp index a647618c701..8ac10b08ee1 100644 --- a/examples/APG/Svc_Config/HA_Configurable_Server_Static.cpp +++ b/examples/APG/Svc_Config/HA_Configurable_Server_Static.cpp @@ -1,7 +1,7 @@ // $Id$ // Listing 1 code/ch19 -#include "ace/OS.h" +#include "ace/OS_main.h" #include "ace/Service_Config.h" #include "ace/Reactor.h" diff --git a/examples/APG/Svc_Config/HA_Status_Dynamic.cpp b/examples/APG/Svc_Config/HA_Status_Dynamic.cpp index 5d9ec185b23..c80817d7efd 100644 --- a/examples/APG/Svc_Config/HA_Status_Dynamic.cpp +++ b/examples/APG/Svc_Config/HA_Status_Dynamic.cpp @@ -5,7 +5,8 @@ * Copyright 2003 Addison-Wesley. All Rights Reserved. */ -#include "ace/OS.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" #include "ace/Configuration.h" #include "ace/Configuration_Import_Export.h" #include "ace/Get_Opt.h" @@ -22,14 +23,14 @@ HA_Status::init (int argc, ACE_TCHAR *argv[]) return -1; int option; ACE_TCHAR config_file[MAXPATHLEN]; - ACE_OS_String::strcpy (config_file, ACE_TEXT ("HAStatus.conf")); + ACE_OS::strcpy (config_file, ACE_TEXT ("HAStatus.conf")); while ((option = cmd_opts ()) != EOF) switch (option) { case 'f': - ACE_OS_String::strncpy (config_file, - cmd_opts.opt_arg (), - MAXPATHLEN); + ACE_OS::strncpy (config_file, + cmd_opts.opt_arg (), + MAXPATHLEN); break; case ':': ACE_ERROR_RETURN ((LM_ERROR, @@ -101,7 +102,7 @@ HA_Status::info (ACE_TCHAR **str, size_t len) const if (*str == 0) *str = ACE::strnew (buf); else - ACE_OS_String::strncpy (*str, buf, len); + ACE_OS::strncpy (*str, buf, len); return ACE_static_cast (int, ACE_OS::strlen (*str)); } // Listing 3 diff --git a/examples/APG/Svc_Config/HA_Status_Static.cpp b/examples/APG/Svc_Config/HA_Status_Static.cpp index 5c2099db160..5027ae34dd5 100644 --- a/examples/APG/Svc_Config/HA_Status_Static.cpp +++ b/examples/APG/Svc_Config/HA_Status_Static.cpp @@ -5,7 +5,8 @@ * Copyright 2003 Addison-Wesley. All Rights Reserved. */ -#include "ace/OS.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" #include "ace/Configuration.h" #include "ace/Configuration_Import_Export.h" #include "ace/Get_Opt.h" @@ -22,14 +23,14 @@ HA_Status::init (int argc, ACE_TCHAR *argv[]) return -1; int option; ACE_TCHAR config_file[MAXPATHLEN]; - ACE_OS_String::strcpy (config_file, ACE_TEXT ("HAStatus.conf")); + ACE_OS::strcpy (config_file, ACE_TEXT ("HAStatus.conf")); while ((option = cmd_opts ()) != EOF) switch (option) { case 'f': - ACE_OS_String::strncpy (config_file, - cmd_opts.opt_arg (), - MAXPATHLEN); + ACE_OS::strncpy (config_file, + cmd_opts.opt_arg (), + MAXPATHLEN); break; case ':': ACE_ERROR_RETURN @@ -99,7 +100,7 @@ HA_Status::info (ACE_TCHAR **str, size_t len) const if (*str == 0) *str = ACE::strnew (buf); else - ACE_OS_String::strncpy (*str, buf, len); + ACE_OS::strncpy (*str, buf, len); return ACE_static_cast (int, ACE_OS::strlen (*str)); } // Listing 3 diff --git a/examples/APG/ThreadManagement/Async_Cancel.cpp b/examples/APG/ThreadManagement/Async_Cancel.cpp index 9d07fce2897..6e05d65ec0b 100644 --- a/examples/APG/ThreadManagement/Async_Cancel.cpp +++ b/examples/APG/ThreadManagement/Async_Cancel.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ace/OS.h" +#include "ace/OS_NS_unistd.h" #include "ace/Task.h" #include "ace/Log_Msg.h" |