diff options
| author | Steve Huston <shuston@riverace.com> | 2004-07-08 20:01:58 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2004-07-08 20:01:58 +0000 |
| commit | de5237b137c53a310b1dd37f672c5327ac944338 (patch) | |
| tree | 0ea1802d2bc88f79e481d0c110c3537f803ae2d9 | |
| parent | 42db43e943893155aab80588c6b2a57e41fee678 (diff) | |
| download | ATCD-de5237b137c53a310b1dd37f672c5327ac944338.tar.gz | |
ChangeLogTag:Thu Jul 8 16:00:29 2004 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | ace/Timer_Queue_Adapters.h | 5 | ||||
| -rw-r--r-- | examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp | 1 | ||||
| -rw-r--r-- | examples/Bounded_Packet_Relay/Bounded_Packet_Relay.mpc | 1 | ||||
| -rw-r--r-- | examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h | 2 |
5 files changed, 22 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 32490c6a0d2..9a6389bd429 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Thu Jul 8 16:00:29 2004 Steve Huston <shuston@riverace.com> + + * ace/Timer_Queue_Adapters.h: If ACE_HAS_DEFERRED_TIMER_COMMANDS is + set, #include "ace/Unbounded_Queue.h" and forward declare + ACE_Command_Base, as these are needed later. + + * examples/Bounded_Packet_Relay/Bounded_Packet_Relay.mpc: + * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h: Moved + the #define ACE_HAS_DEFERRED_TIMER_COMMANDS macro setting from the + .h file to the .mpc file. Helps poor Visual Age C++ deal with it + correctly when instantiating templates. + + * examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp: Added #include + "ace/OS_NS_string.h" to pick up ACE_OS::memset(). + Thu Jul 8 11:32:31 2004 Steve Huston <shuston@riverace.com> * ace: Renamed config-aix-5.1.h to config-aix-5.x.h since it covers diff --git a/ace/Timer_Queue_Adapters.h b/ace/Timer_Queue_Adapters.h index 17053e8b456..e02fb262af6 100644 --- a/ace/Timer_Queue_Adapters.h +++ b/ace/Timer_Queue_Adapters.h @@ -24,6 +24,11 @@ #include "ace/Signal.h" #include "ace/Condition_Recursive_Thread_Mutex.h" +#if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS) +# include "ace/Unbounded_Queue.h" +class ACE_Command_Base; +#endif /* ACE_HAS_DEFERRED_TIMER_COMMANDS */ + /** * @class ACE_Async_Timer_Queue_Adapter * diff --git a/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp b/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp index ebd3d174777..6e597dfb9e5 100644 --- a/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp +++ b/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp @@ -29,6 +29,7 @@ // #include BPR_Drivers.h instead of BPR_Drivers_T.h // to avoid problems with circular includes #include "BPR_Drivers.h" +#include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" ACE_RCSID(Bounded_Packet_Relay, BPR_Drivers_T, "$Id$") diff --git a/examples/Bounded_Packet_Relay/Bounded_Packet_Relay.mpc b/examples/Bounded_Packet_Relay/Bounded_Packet_Relay.mpc index bea0f975da4..087cc5ac3be 100644 --- a/examples/Bounded_Packet_Relay/Bounded_Packet_Relay.mpc +++ b/examples/Bounded_Packet_Relay/Bounded_Packet_Relay.mpc @@ -3,4 +3,5 @@ project : aceexe { exename = bpr_thread + macros += ACE_HAS_DEFERRED_TIMER_COMMANDS } diff --git a/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h b/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h index 5739de2ffaa..ccd5782b487 100644 --- a/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h +++ b/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h @@ -28,8 +28,6 @@ #ifndef _THREAD_BOUNDED_PACKET_RELAY_H_ #define _THREAD_BOUNDED_PACKET_RELAY_H_ -#define ACE_HAS_DEFERRED_TIMER_COMMANDS - #include "ace/Functor_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) |