diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2000-07-30 03:04:48 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2000-07-30 03:04:48 +0000 |
| commit | 1fbddf6bc26b9857e830a5ec8ac97ab9061be48b (patch) | |
| tree | de61340bb6d7b454d9d1a593b6fba5c2e353fed2 | |
| parent | 1c1fa1f34bb016aa8ee0bcf315c763d538d68ca1 (diff) | |
| download | ATCD-1fbddf6bc26b9857e830a5ec8ac97ab9061be48b.tar.gz | |
ChangeLogTag: Sat Jul 29 22:01:12 2000 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h | 1 |
5 files changed, 16 insertions, 4 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 88af19f1c2d..5d749f7f639 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,13 @@ +Sat Jul 29 22:01:12 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Collection.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Collection.h: + * orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h: + + Hopefully some of the errors in vxworks for Notification + services and g++ in AV should be fixed. + Sat Jul 29 16:46:31 2000 Jeff Parsons <parsons@cs.wustl.edu> * tests/DynAny_Test/test_dynarray.cpp: diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index ba0e5fd9521..ff621544e77 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -215,7 +215,7 @@ TAO_AV_Endpoint_Process_Strategy::get_vdev (CORBA::Environment &ACE_TRY_ENV) { char vdev_name [BUFSIZ]; ACE_OS::sprintf (vdev_name, - "%s:%s:%d", + "%s:%s:%ld", "VDev", this->host_, this->pid_); @@ -297,7 +297,7 @@ TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (CORBA::Environment &ACE { char stream_endpoint_name[BUFSIZ]; ACE_OS::sprintf (stream_endpoint_name, - "%s:%s:%d", + "%s:%s:%ld", "Stream_Endpoint_A", this->host_, this->pid_); @@ -391,7 +391,7 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (CORBA::Environment &ACE { char stream_endpoint_name[BUFSIZ]; ACE_OS::sprintf (stream_endpoint_name, - "%s:%s:%d", + "%s:%s:%ld", "Stream_Endpoint_B", this->host_, this->pid_); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp index 53a7803c1a0..042f5cdd761 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Notify_Collection.h" -#include "Notify_Event.h" +//#include "Notify_Event.h" #include "Notify_Listeners.h" ACE_RCSID(Notify, Notify_Collection, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h index 4066fae6b44..2ecadfb8b77 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h @@ -27,6 +27,7 @@ #include "orbsvcs/ESF/ESF_Worker.h" #include "notify_export.h" +#include "Notify_Event.h" template<class PROXY> class TAO_ESF_Proxy_Collection; template<class T> class ACE_Unbounded_Set; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h index 2b5f34aec6e..feab9dd8522 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h @@ -1,3 +1,4 @@ +/* -*- C++ -*- */ // $Id$ // ========================================================================== // |