diff options
| -rw-r--r-- | ChangeLog | 64 | ||||
| -rw-r--r-- | ace/Cache_Map_Manager_T.cpp | 1 | ||||
| -rw-r--r-- | ace/Caching_Strategies_T.i | 2 | ||||
| -rw-r--r-- | ace/Env_Value_T.h | 2 | ||||
| -rw-r--r-- | ace/Reverse_Lock_T.inl | 2 | ||||
| -rw-r--r-- | tests/Bound_Ptr_Test.cpp | 61 | ||||
| -rw-r--r-- | tests/Bound_Ptr_Test.h | 88 | ||||
| -rw-r--r-- | tests/Buffer_Stream_Test.cpp | 1 | ||||
| -rw-r--r-- | tests/CDR_Test.cpp | 1 | ||||
| -rw-r--r-- | tests/Cache_Map_Manager_Test.cpp | 2 | ||||
| -rw-r--r-- | tests/Cached_Accept_Conn_Test.cpp | 1 | ||||
| -rw-r--r-- | tests/Cached_Allocator_Test.cpp | 1 | ||||
| -rw-r--r-- | tests/Cached_Conn_Test.cpp | 1 | ||||
| -rw-r--r-- | tests/Capabilities_Test.cpp | 2 | ||||
| -rw-r--r-- | tests/Config_Test.cpp | 1 | ||||
| -rw-r--r-- | tests/Conn_Test.cpp | 5 | ||||
| -rw-r--r-- | tests/Conn_Test.h | 1 | ||||
| -rw-r--r-- | tests/Env_Value_Test.cpp | 2 | ||||
| -rw-r--r-- | tests/Future_Set_Test.cpp | 2 | ||||
| -rw-r--r-- | tests/Future_Test.cpp | 2 | ||||
| -rw-r--r-- | tests/Get_Opt_Test.cpp | 1 | ||||
| -rw-r--r-- | tests/Handle_Set_Test.cpp | 1 | ||||
| -rw-r--r-- | tests/Hash_Map_Bucket_Iterator_Test.cpp | 1 | ||||
| -rw-r--r-- | tests/Logging_Strategy_Test.cpp | 3 | ||||
| -rw-r--r-- | tests/MEM_Stream_Test.cpp | 1 | ||||
| -rw-r--r-- | tests/MT_Reactor_Upcall_Test.cpp | 1 |
26 files changed, 191 insertions, 59 deletions
diff --git a/ChangeLog b/ChangeLog index 04c695027f0..69fdfe11fa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,67 @@ +Fri Nov 28 17:17:29 2003 Steve Huston <shuston@riverace.com> + + * ace/Caching_Strategies_T.i: Added #include "ace/OS_Memory.h" so + ACE_NEW can be found properly when inlined methods are used without + the .cpp file, such as when instantiating templates in AIX Visual + Age C++. + + * ace/Cache_Map_Manager_T.cpp: Added #include "ace/Log_Msg.h" to + find ACE_ERROR, et al. + + * ace/Env_Value_T.h: Added #include "ace/Global_Macros.h" to + get ACE_UNIMPLEMENTED_FUNC and "ace/OS_NS_stdlib.h" to get + strtol, strtoul. + + * ace/Reverse_Lock_T.inl: Added #include "ace/OS_NS_errno.h" so + errno can be found properly when inlined methods are used without + the .cpp file, such as when instantiating templates in AIX Visual + Age C++. + + * tests/Bound_Ptr_Test.{h, cpp}: Added #include "ace/Null_Mutex.h" + to find ACE_Null_Mutex. Moved the Printer and Scheduler class + definitions from Bound_Ptr_Test.cpp to a new file, Bound_Ptr_Test.h + so AIX Visual Age C++ can find it when instantiating templates. + + * tests/Buffer_Stream_Test.cpp: + * tests/Cached_Accept_Conn_Test.cpp: + * tests/Cached_Allocator_Test.cpp: + * tests/Cached_Conn_Test.cpp: + * tests/CDR_Test.cpp: + * tests/Config_Test.cpp: + * tests/Env_Value_Test.cpp: + * tests/Logging_Strategy_Test.cpp: + * tests/MT_Reactor_Upcall_Test.cpp: Added #include + "ace/OS_NS_string.h" to get string functions. + + * tests/Cache_Map_Manager_Test.cpp: Added #include "ace/OS_NS_stdlib.h" + to get atoi() and srand(), and "ace/OS_Memory.h" for ACE_NEW. + + * tests/Capabilities_Test.cpp: Added #include "ace/OS_NS_fcntl.h" to + get open() and "ace/OS_NS_unistd.h" to get write(). + + * tests/Conn_Test.cpp: Added #include "ace/OS_NS_sys_select.h" to get + select() and the proper mutex header, Thread_Mutex.h, Null_Mutex.h, + or Process_Mutex.h. + + * tests/Conn_Test.h: Added #include "ace/Null_Condition.h" so the + template parent has it available when instantiating templates. + + * tests/Env_Value_Test.cpp: + * tests/Get_Opt_Test.cpp: + * tests/Handle_Set_Test.cpp: + * tests/Hash_Map_Bucket_Iterator_Test.cpp: Added #include + "ace/OS_NS_stdlib.h" to get itoa(). + + * tests/Future_Set_Test.cpp: + * tests/Logging_Strategy_Test.cpp: Added #include "ace/OS_NS_stdio.h" + and "ace/OS_NS_unistd.h" to get missing symbols on AIX. + + * tests/Future_Test.cpp: Added #include "ace/OS_NS_sys_time.h" to get + gettimeofday() and "ace/OS_NS_string.h" to get strlen(). + + * tests/MEM_Stream_Test.cpp: Added #include "ace/OS_NS_stdio.h" to get + sprintf(). + Fri Nov 28 11:21:05 2003 Ossama Othman <ossama@dre.vanderbilt.edu> The following are fixes for problems exposed by running diff --git a/ace/Cache_Map_Manager_T.cpp b/ace/Cache_Map_Manager_T.cpp index d1ffb8108f1..b2825f68eb0 100644 --- a/ace/Cache_Map_Manager_T.cpp +++ b/ace/Cache_Map_Manager_T.cpp @@ -9,6 +9,7 @@ #define ACE_LACKS_PRAGMA_ONCE #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Log_Msg.h" #include "ace/Malloc_Base.h" #if !defined (__ACE_INLINE__) diff --git a/ace/Caching_Strategies_T.i b/ace/Caching_Strategies_T.i index be5e7b86c62..12e82be947b 100644 --- a/ace/Caching_Strategies_T.i +++ b/ace/Caching_Strategies_T.i @@ -3,6 +3,8 @@ ////////////////////////////////////////////////////////////////////////////////// +#include "ace/OS_Memory.h" + template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::ACE_Caching_Strategy_Adapter (IMPLEMENTATION *implementation, int delete_implementation) diff --git a/ace/Env_Value_T.h b/ace/Env_Value_T.h index e344e325486..3429b7914bd 100644 --- a/ace/Env_Value_T.h +++ b/ace/Env_Value_T.h @@ -20,6 +20,8 @@ #include /**/ "ace/pre.h" #include "ace/config-all.h" +#include "ace/Global_Macros.h" +#include "ace/OS_NS_stdlib.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Reverse_Lock_T.inl b/ace/Reverse_Lock_T.inl index 4cc06975c51..79d9c47c788 100644 --- a/ace/Reverse_Lock_T.inl +++ b/ace/Reverse_Lock_T.inl @@ -1,6 +1,8 @@ /* -*- C++ -*- */ // $Id$ +#include "ace/OS_NS_errno.h" + template <class ACE_LOCKING_MECHANISM> ACE_INLINE ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::ACE_Reverse_Lock (ACE_LOCKING_MECHANISM &lock, ACE_Acquire_Method::METHOD_TYPE acquire_method) diff --git a/tests/Bound_Ptr_Test.cpp b/tests/Bound_Ptr_Test.cpp index b8b37c68165..c7489ea544b 100644 --- a/tests/Bound_Ptr_Test.cpp +++ b/tests/Bound_Ptr_Test.cpp @@ -17,9 +17,8 @@ //============================================================================= #include "test_config.h" -#include "ace/Task.h" -#include "ace/Activation_Queue.h" -#include "ace/Bound_Ptr.h" +#include "ace/Null_Mutex.h" +#include "Bound_Ptr_Test.h" ACE_RCSID (tests, Bound_Ptr_Test, "Bound_Ptr_Test.cpp,v 4.8 2000/04/23 04:43:58 brunsch Exp") @@ -157,17 +156,6 @@ template class ACE_Bound_Ptr_Counter<ACE_Null_Mutex>; #pragma instantiate ACE_Bound_Ptr_Counter<ACE_Null_Mutex> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -struct Printer -{ - Printer (const char *message); - ~Printer (void) ; - - void print (void); - - const char *message_; - static size_t instance_count_; -}; - size_t Printer::instance_count_ = 0; Printer::Printer (const char *message) @@ -195,51 +183,6 @@ Printer::print (void) #if defined (ACE_HAS_THREADS) -typedef ACE_Strong_Bound_Ptr<Printer, ACE_Thread_Mutex> Printer_var; - -/** - * @class Scheduler - * - * @brief The scheduler for the Active Object. - * - * This class also plays the role of the Proxy and the Servant - * in the Active Object pattern. Naturally, these roles could - * be split apart from the Scheduler. - */ -class Scheduler : public ACE_Task<ACE_SYNCH> -{ - - friend class Method_Request_print; - friend class Method_Request_end; -public: - // = Initialization and termination methods. - /// Constructor. - Scheduler (Scheduler * = 0); - - /// Initializer. - virtual int open (void *args = 0); - - /// Terminator. - virtual int close (u_long flags = 0); - - /// Destructor. - virtual ~Scheduler (void); - - // = These methods are part of the Active Object Proxy interface. - void print (Printer_var &printer); - void end (void); - -protected: - /// Runs the Scheduler's event loop, which dequeues <Method_Requests> - /// and dispatches them. - virtual int svc (void); - -private: - // = These are the <Scheduler> implementation details. - ACE_Activation_Queue activation_queue_; - Scheduler *scheduler_; -}; - /** * @class Method_Request_print * diff --git a/tests/Bound_Ptr_Test.h b/tests/Bound_Ptr_Test.h new file mode 100644 index 00000000000..3b5a899e671 --- /dev/null +++ b/tests/Bound_Ptr_Test.h @@ -0,0 +1,88 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// tests +// +// = FILENAME +// Bound_Ptr_Test.h +// +// = DESCRIPTION +// Define class needed for generating templates. IBM C++ requires this to +// be in its own file for auto template instantiation. +// +// = AUTHOR +// @author Christopher Kohlhoff <chris@kohlhoff.com> +// +// ============================================================================ + +#ifndef ACE_TESTS_BOUND_PTR_TEST_H +#define ACE_TESTS_BOUND_PTR_TEST_H + +#if defined (ACE_HAS_THREADS) + +#include "ace/Activation_Queue.h" +#include "ace/Bound_Ptr.h" +#include "ace/Synch.h" +#include "ace/Task.h" +#include "ace/Thread_Mutex.h" + +struct Printer +{ + Printer (const char *message); + ~Printer (void) ; + + void print (void); + + const char *message_; + static size_t instance_count_; +}; + +typedef ACE_Strong_Bound_Ptr<Printer, ACE_Thread_Mutex> Printer_var; + +/** + * @class Scheduler + * + * @brief The scheduler for the Active Object. + * + * This class also plays the role of the Proxy and the Servant + * in the Active Object pattern. Naturally, these roles could + * be split apart from the Scheduler. + */ +class Scheduler : public ACE_Task<ACE_SYNCH> +{ + + friend class Method_Request_print; + friend class Method_Request_end; +public: + // = Initialization and termination methods. + /// Constructor. + Scheduler (Scheduler * = 0); + + /// Initializer. + virtual int open (void *args = 0); + + /// Terminator. + virtual int close (u_long flags = 0); + + /// Destructor. + virtual ~Scheduler (void); + + // = These methods are part of the Active Object Proxy interface. + void print (Printer_var &printer); + void end (void); + +protected: + /// Runs the Scheduler's event loop, which dequeues <Method_Requests> + /// and dispatches them. + virtual int svc (void); + +private: + // = These are the <Scheduler> implementation details. + ACE_Activation_Queue activation_queue_; + Scheduler *scheduler_; +}; + +#endif /* ACE_HAS_THREADS */ +#endif /* ACE_TESTS_BOUND_PTR_TEST_H */ diff --git a/tests/Buffer_Stream_Test.cpp b/tests/Buffer_Stream_Test.cpp index 73a91fd9e1b..282b0f928fc 100644 --- a/tests/Buffer_Stream_Test.cpp +++ b/tests/Buffer_Stream_Test.cpp @@ -25,6 +25,7 @@ #include "ace/Stream.h" #include "ace/Module.h" #include "ace/Task.h" +#include "ace/OS_NS_string.h" #include "ace/OS_NS_time.h" ACE_RCSID(tests, Buffer_Stream_Test, "$Id$") diff --git a/tests/CDR_Test.cpp b/tests/CDR_Test.cpp index 3a918a1c68a..df6725f3497 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_string.h" #include "ace/OS_NS_wchar.h" ACE_RCSID(tests, CDR_Test, "$Id$") diff --git a/tests/Cache_Map_Manager_Test.cpp b/tests/Cache_Map_Manager_Test.cpp index e03d07b7bd2..43664e33d7a 100644 --- a/tests/Cache_Map_Manager_Test.cpp +++ b/tests/Cache_Map_Manager_Test.cpp @@ -25,6 +25,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS_Memory.h" +#include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_time.h" #include "test_config.h" #include "ace/Hash_Cache_Map_Manager_T.h" diff --git a/tests/Cached_Accept_Conn_Test.cpp b/tests/Cached_Accept_Conn_Test.cpp index 1862b0b1c03..331d41261dc 100644 --- a/tests/Cached_Accept_Conn_Test.cpp +++ b/tests/Cached_Accept_Conn_Test.cpp @@ -38,6 +38,7 @@ #include "Cached_Accept_Conn_Test.h" +#include "ace/OS_NS_string.h" #include "ace/Get_Opt.h" #if defined(_MSC_VER) diff --git a/tests/Cached_Allocator_Test.cpp b/tests/Cached_Allocator_Test.cpp index dabbf289cd0..0e5bcf5f28f 100644 --- a/tests/Cached_Allocator_Test.cpp +++ b/tests/Cached_Allocator_Test.cpp @@ -17,6 +17,7 @@ // ============================================================================ #include "test_config.h" +#include "ace/OS_NS_string.h" #include "ace/Malloc_T.h" #include "ace/High_Res_Timer.h" diff --git a/tests/Cached_Conn_Test.cpp b/tests/Cached_Conn_Test.cpp index 9833ffeaca9..2c24cc6afca 100644 --- a/tests/Cached_Conn_Test.cpp +++ b/tests/Cached_Conn_Test.cpp @@ -36,6 +36,7 @@ #define ACE_HAS_BROKEN_EXTENDED_TEMPLATES #endif /* __GNUC__ */ +#include "ace/OS_NS_string.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Connector.h" #include "ace/SOCK_Acceptor.h" diff --git a/tests/Capabilities_Test.cpp b/tests/Capabilities_Test.cpp index 35c7f4875c7..ea59b43598b 100644 --- a/tests/Capabilities_Test.cpp +++ b/tests/Capabilities_Test.cpp @@ -17,6 +17,8 @@ // // ============================================================================ +#include "ace/OS_NS_fcntl.h" +#include "ace/OS_NS_unistd.h" #include "ace/Capabilities.h" #include "test_config.h" diff --git a/tests/Config_Test.cpp b/tests/Config_Test.cpp index a1f0b549f44..9927cbd3f03 100644 --- a/tests/Config_Test.cpp +++ b/tests/Config_Test.cpp @@ -24,6 +24,7 @@ #include "ace/Configuration_Import_Export.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" ACE_RCSID(tests, Config_Test, "$Id$") diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp index 57d6dd1afa0..b1d0b8599a8 100644 --- a/tests/Conn_Test.cpp +++ b/tests/Conn_Test.cpp @@ -36,6 +36,7 @@ #include "Conn_Test.h" #include "ace/Barrier.h" #include "ace/OS_NS_signal.h" +#include "ace/OS_NS_sys_select.h" #include "ace/OS_NS_sys_wait.h" #include "ace/os_include/os_netdb.h" @@ -52,14 +53,18 @@ static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; // #if defined (ACE_LACKS_FORK) # if defined (ACE_HAS_THREADS) +# include "ace/Thread_Mutex.h" typedef ACE_Thread_Mutex ACCEPTOR_LOCKING; # else +# include "ace/Null_Mutex.h" typedef ACE_Null_Mutex ACCEPTOR_LOCKING; # endif /* ACE_HAS_THREADS */ #else # if defined (ACE_HAS_THREAD_SAFE_ACCEPT) +# include "ace/Null_Mutex.h" typedef ACE_Null_Mutex ACCEPTOR_LOCKING; # else +# include "ace/Process_Mutex.h" typedef ACE_Process_Mutex ACCEPTOR_LOCKING; # endif /* ACE_HAS_THREAD_SAFE_ACCEPT */ #endif /* ACE_LACKS_FORK */ diff --git a/tests/Conn_Test.h b/tests/Conn_Test.h index 86f7adbf805..38e3cda4cd5 100644 --- a/tests/Conn_Test.h +++ b/tests/Conn_Test.h @@ -24,6 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Null_Condition.h" #include "ace/Svc_Handler.h" #include "ace/SOCK_Stream.h" diff --git a/tests/Env_Value_Test.cpp b/tests/Env_Value_Test.cpp index bb2ece06627..131197fdd45 100644 --- a/tests/Env_Value_Test.cpp +++ b/tests/Env_Value_Test.cpp @@ -15,6 +15,8 @@ // ============================================================================ #include "test_config.h" +#include "ace/OS_NS_stdlib.h" +#include "ace/OS_NS_string.h" #include "ace/Process.h" #include "ace/Env_Value_T.h" diff --git a/tests/Future_Set_Test.cpp b/tests/Future_Set_Test.cpp index 61324dc9953..beda647292b 100644 --- a/tests/Future_Set_Test.cpp +++ b/tests/Future_Set_Test.cpp @@ -24,6 +24,7 @@ // ============================================================================ #include "test_config.h" +#include "ace/OS_NS_string.h" #include "ace/ACE.h" #include "ace/Task.h" #include "ace/Message_Queue.h" @@ -33,6 +34,7 @@ #include "ace/Activation_Queue.h" #include "ace/Auto_Ptr.h" #include "ace/Atomic_Op.h" +#include "ace/Null_Mutex.h" ACE_RCSID(tests, Future_Set_Test, "$Id$") diff --git a/tests/Future_Test.cpp b/tests/Future_Test.cpp index adf0696ca70..5419e022c44 100644 --- a/tests/Future_Test.cpp +++ b/tests/Future_Test.cpp @@ -23,6 +23,8 @@ // ============================================================================ #include "test_config.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_sys_time.h" #include "ace/ACE.h" #include "ace/Task.h" #include "ace/Message_Queue.h" diff --git a/tests/Get_Opt_Test.cpp b/tests/Get_Opt_Test.cpp index a4a7f159a28..dbdb4682e9b 100644 --- a/tests/Get_Opt_Test.cpp +++ b/tests/Get_Opt_Test.cpp @@ -17,6 +17,7 @@ #include "ace/Get_Opt.h" #include "ace/ARGV.h" #include "ace/SString.h" +#include "ace/OS_NS_stdlib.h" #include "tests/test_config.h" ACE_RCSID(tests, Get_Opt_Test, "$Id$") diff --git a/tests/Handle_Set_Test.cpp b/tests/Handle_Set_Test.cpp index d6e18a00403..06e5c9a1ad7 100644 --- a/tests/Handle_Set_Test.cpp +++ b/tests/Handle_Set_Test.cpp @@ -19,6 +19,7 @@ // ============================================================================ #include "test_config.h" +#include "ace/OS_NS_stdlib.h" #include "ace/Profile_Timer.h" #include "ace/Handle_Set.h" #include "ace/Containers.h" diff --git a/tests/Hash_Map_Bucket_Iterator_Test.cpp b/tests/Hash_Map_Bucket_Iterator_Test.cpp index affd0ba8698..d05f5bcdf98 100644 --- a/tests/Hash_Map_Bucket_Iterator_Test.cpp +++ b/tests/Hash_Map_Bucket_Iterator_Test.cpp @@ -17,6 +17,7 @@ // ============================================================================ #include "test_config.h" +#include "ace/OS_NS_stdlib.h" #include "ace/Hash_Map_Manager.h" #include "ace/Synch_Traits.h" #include "ace/Null_Mutex.h" diff --git a/tests/Logging_Strategy_Test.cpp b/tests/Logging_Strategy_Test.cpp index f393d3033d1..5fa8d9619d3 100644 --- a/tests/Logging_Strategy_Test.cpp +++ b/tests/Logging_Strategy_Test.cpp @@ -32,6 +32,9 @@ // //========================================================================== +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_stat.h" #include "ace/Auto_Ptr.h" #include "ace/Service_Config.h" diff --git a/tests/MEM_Stream_Test.cpp b/tests/MEM_Stream_Test.cpp index 2c5ee3b24b3..ea85cfd87a9 100644 --- a/tests/MEM_Stream_Test.cpp +++ b/tests/MEM_Stream_Test.cpp @@ -18,6 +18,7 @@ // ============================================================================ #include "test_config.h" +#include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" #include "ace/Thread_Manager.h" #include "ace/MEM_Connector.h" diff --git a/tests/MT_Reactor_Upcall_Test.cpp b/tests/MT_Reactor_Upcall_Test.cpp index 5c9e5992c9f..60a98f2b3a7 100644 --- a/tests/MT_Reactor_Upcall_Test.cpp +++ b/tests/MT_Reactor_Upcall_Test.cpp @@ -19,6 +19,7 @@ // ============================================================================ #include "test_config.h" +#include "ace/OS_NS_string.h" #include "ace/Reactor.h" #include "ace/TP_Reactor.h" #include "ace/WFMO_Reactor.h" |