diff options
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 17 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp | 3 |
4 files changed, 18 insertions, 9 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 96562405f09..5380e14543f 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,14 @@ +Mon Dec 17 23:26:47 2001 Carlos O'Ryan <coryan@uci.edu> + + * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp: + Moved "ace/Reactor.h" include *after* the local includes. That + makes it easier to detect errors in the local header files. + + * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp: + Fixed info messages under Tru64/CXX, there was some useless code + left over from before the corba-env-clean changes. + Mon Dec 17 17:15:55 2001 Justin Michel <michel_j@ociweb.com> * tao/tests/ORB_init/Portspan/Portspan.dsp: @@ -21,16 +32,16 @@ Mon Dec 17 10:09:55 2001 Venkita Subramonian <venkita@cs.wustl.edu> * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp: orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp: - + Added #include "ace/Reactor.h" to fix compile errors in TRU64CXX * orbsvcs/orbsvcs/AV/RTP.cpp: - + Added #include "tao/debug.h" to fix compile errors. Mon Dec 17 07:23:47 2001 Balachandran Natarajan <bala@cs.wustl.edu> - * docs/performance.html: Added some comments to the document. + * docs/performance.html: Added some comments to the document. Sun Dec 16 10:33:47 2001 Ossama Othman <ossama@uci.edu> diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp index d4acbd9a6f4..2270576d96a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp @@ -1,6 +1,5 @@ // $Id$ -#include "ace/Reactor.h" #include "CEC_Reactive_Pulling_Strategy.h" #include "CEC_ProxyPullConsumer.h" #include "CEC_EventChannel.h" @@ -10,6 +9,8 @@ #include "tao/Messaging.h" #include "tao/ORB_Core.h" +#include "ace/Reactor.h" + #if ! defined (__ACE_INLINE__) #include "CEC_Reactive_Pulling_Strategy.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp index f481d4f1bac..89fa3596658 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp @@ -38,10 +38,6 @@ TAO_ESF_Connected_Command<Target,Object>::execute (void* arg) template<class Target, class Object> int TAO_ESF_Reconnected_Command<Target,Object>::execute (void* arg) { - CORBA::Environment *env = &TAO_default_environment (); - if (arg != 0) - env = ACE_static_cast(CORBA::Environment*, arg); - if (arg != 0) { TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index ae115aac4e7..624920c3b4e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -1,10 +1,11 @@ // $Id$ -#include "ace/Reactor.h" #include "orbsvcs/Event/ECG_Mcast_EH.h" #include "orbsvcs/Event/EC_Gateway_UDP.h" #include "orbsvcs/Event_Service_Constants.h" +#include "ace/Reactor.h" + #if !defined(__ACE_INLINE__) #include "ECG_Mcast_EH.i" #endif /* __ACE_INLINE__ */ |