diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | ace/SSL/SSL_SOCK_Stream.cpp | 5 | ||||
| -rw-r--r-- | examples/C++NPv2/AC_Client_Logging_Daemon.cpp | 2 | ||||
| -rw-r--r-- | examples/C++NPv2/AIO_Client_Logging_Daemon.cpp | 1 | ||||
| -rw-r--r-- | examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp | 2 | ||||
| -rw-r--r-- | tests/CDR_Array_Test.cpp | 2 | ||||
| -rw-r--r-- | tests/CDR_File_Test.cpp | 2 | ||||
| -rw-r--r-- | tests/CDR_Test.cpp | 1 | ||||
| -rw-r--r-- | tests/Config_Test.cpp | 5 | ||||
| -rw-r--r-- | tests/MEM_Stream_Test.cpp | 1 | ||||
| -rw-r--r-- | tests/Pipe_Test.cpp | 1 | ||||
| -rw-r--r-- | tests/Proactor_Test.cpp | 4 | ||||
| -rw-r--r-- | tests/Proactor_Test_IPV6.cpp | 4 | ||||
| -rw-r--r-- | tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp | 1 |
14 files changed, 42 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 9a0d0399170..edde74ee611 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +Thu Jun 17 11:52:39 2004 Steve Huston <shuston@riverace.com> + + * ace/SSL/SSL_SOCK_Stream.cpp: + * examples/C++NPv2/AC_CLient_Logging_Daemon.cpp: + * examples/C++NPv2/AIO_Client_Logging_Daemon.cpp: + * examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp: + * tests/CDR_Array_Test.cpp: + * tests/CDR_File_Test.cpp: + * tests/CDR_Test.cpp: + * tests/Config_Test.cpp: + * tests/MEM_Stream_Test.cpp: + * tests/Pipe_Test.cpp: + * tests/Proactor_Test.cpp: + * tests/Proactor_Test_IPV6.cpp: + * tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp: + Added needed includes to fix AIX Visual Age C++ compile problems. + Thu Jun 17 09:43:49 2004 Douglas C. Schmidt <schmidt@cs.wustl.edu> * docs/ACE-porting.html: Updated this file so that it mentions diff --git a/ace/SSL/SSL_SOCK_Stream.cpp b/ace/SSL/SSL_SOCK_Stream.cpp index 51147c93547..6f085e7641d 100644 --- a/ace/SSL/SSL_SOCK_Stream.cpp +++ b/ace/SSL/SSL_SOCK_Stream.cpp @@ -4,12 +4,13 @@ #include "ace/Handle_Set.h" #include "ace/Log_Msg.h" +#include "ace/Time_Value.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_sys_select.h" #include <openssl/err.h> #include "SSL_SOCK_Stream.h" -#include "ace/OS_NS_string.h" -#include "ace/OS_NS_sys_select.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) #include "SSL_SOCK_Stream.i" diff --git a/examples/C++NPv2/AC_Client_Logging_Daemon.cpp b/examples/C++NPv2/AC_Client_Logging_Daemon.cpp index 731e737462f..f59b385a903 100644 --- a/examples/C++NPv2/AC_Client_Logging_Daemon.cpp +++ b/examples/C++NPv2/AC_Client_Logging_Daemon.cpp @@ -4,6 +4,8 @@ ** Copyright 2002 Addison Wesley. All Rights Reserved. */ +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_socket.h" #include "ace/OS_NS_sys_time.h" #include "ace/Acceptor.h" diff --git a/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp b/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp index 0b3554daa22..071d602e09d 100644 --- a/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp +++ b/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp @@ -9,6 +9,7 @@ #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)) #include "ace/OS_NS_string.h" +#include "ace/OS_NS_sys_socket.h" #include "ace/Asynch_Acceptor.h" #include "ace/Asynch_Connector.h" #include "ace/Asynch_IO.h" diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp index 0278aa01866..d74eb14658b 100644 --- a/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp +++ b/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp @@ -5,6 +5,8 @@ // single-threaded concurrent server. This server program can be // driven by the oneway test mode of SSL-client.cpp. +#include "ace/OS_NS_unistd.h" +#include "ace/Time_Value.h" #include "ace/SSL/SSL_SOCK_Acceptor.h" ACE_RCSID (SSL_SAP, diff --git a/tests/CDR_Array_Test.cpp b/tests/CDR_Array_Test.cpp index c5ee79e07bf..dd87408bd7b 100644 --- a/tests/CDR_Array_Test.cpp +++ b/tests/CDR_Array_Test.cpp @@ -42,6 +42,8 @@ #endif #include "test_config.h" +#include "ace/OS_Memory.h" +#include "ace/OS_NS_stdlib.h" #include "ace/Get_Opt.h" #include "ace/CDR_Stream.h" #include "ace/High_Res_Timer.h" diff --git a/tests/CDR_File_Test.cpp b/tests/CDR_File_Test.cpp index 6e72afd6fe9..b433c67050d 100644 --- a/tests/CDR_File_Test.cpp +++ b/tests/CDR_File_Test.cpp @@ -19,6 +19,8 @@ // ============================================================================ #include "test_config.h" +#include "ace/OS_Memory.h" +#include "ace/OS_NS_stdlib.h" #include "ace/CDR_Stream.h" #include "ace/FILE_Connector.h" #include "ace/Auto_Ptr.h" diff --git a/tests/CDR_Test.cpp b/tests/CDR_Test.cpp index df6725f3497..ed4fff4a373 100644 --- a/tests/CDR_Test.cpp +++ b/tests/CDR_Test.cpp @@ -24,6 +24,7 @@ #include "ace/CDR_Stream.h" #include "ace/SString.h" #include "ace/ACE.h" +#include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_wchar.h" diff --git a/tests/Config_Test.cpp b/tests/Config_Test.cpp index 7774c0be3a7..6fe3e5b0dfd 100644 --- a/tests/Config_Test.cpp +++ b/tests/Config_Test.cpp @@ -22,6 +22,7 @@ #include "test_config.h" #include "Config_Test.h" #include "ace/Configuration_Import_Export.h" +#include "ace/OS_NS_ctype.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" @@ -1426,8 +1427,8 @@ Config_Test::get_section_boolean (ACE_Configuration& config, *pSrc != ACE_TEXT ('\0'); pSrc++) // Convert to uppercase - if (islower (*pSrc)) - *pSrc = tolower (*pSrc); + if (ACE_OS::ace_islower (*pSrc)) + *pSrc = ACE_OS::to_lower (*pSrc); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s = %s\n"), diff --git a/tests/MEM_Stream_Test.cpp b/tests/MEM_Stream_Test.cpp index 922850797f8..100327c72d4 100644 --- a/tests/MEM_Stream_Test.cpp +++ b/tests/MEM_Stream_Test.cpp @@ -19,6 +19,7 @@ #include "test_config.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" #include "ace/Get_Opt.h" #include "ace/Thread_Manager.h" diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp index 08e897b99ae..264c0331755 100644 --- a/tests/Pipe_Test.cpp +++ b/tests/Pipe_Test.cpp @@ -22,6 +22,7 @@ #include "ace/Get_Opt.h" #include "ace/ACE.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Pipe_Test, "$Id$") diff --git a/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp index a4dfbb6ca44..a3ce1b084d5 100644 --- a/tests/Proactor_Test.cpp +++ b/tests/Proactor_Test.cpp @@ -39,10 +39,12 @@ ACE_RCSID (tests, #include "ace/Asynch_Connector.h" #include "ace/Task.h" #include "ace/Thread_Semaphore.h" +#include "ace/OS_NS_ctype.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_signal.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_sys_socket.h" #include "ace/os_include/netinet/os_tcp.h" #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) @@ -1702,7 +1704,7 @@ set_proactor_type (const ACE_TCHAR *ptype) if (!ptype) return 0; - switch (toupper (*ptype)) + switch (ACE_OS::to_upper (*ptype)) { case 'D': proactor_type = DEFAULT; diff --git a/tests/Proactor_Test_IPV6.cpp b/tests/Proactor_Test_IPV6.cpp index f49798e044c..35688cc3f78 100644 --- a/tests/Proactor_Test_IPV6.cpp +++ b/tests/Proactor_Test_IPV6.cpp @@ -33,10 +33,12 @@ #include "ace/Asynch_Connector.h" #include "ace/Task.h" #include "ace/Thread_Semaphore.h" +#include "ace/OS_NS_ctype.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_signal.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_sys_socket.h" #include "ace/os_include/netinet/os_tcp.h" #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) @@ -1735,7 +1737,7 @@ set_proactor_type (const ACE_TCHAR *ptype) if (!ptype) return 0; - switch (toupper (*ptype)) + switch (ACE_OS::to_upper (*ptype)) { case 'D': proactor_type = DEFAULT; diff --git a/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp b/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp index 00bdd8a986c..c9c5992be17 100644 --- a/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp +++ b/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp @@ -42,6 +42,7 @@ #include "tests/test_config.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" #include "ace/Get_Opt.h" #include "ace/Acceptor.h" #include "ace/Thread_Manager.h" |