diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2000-01-11 22:48:25 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2000-01-11 22:48:25 +0000 |
| commit | 08686a42a5f4040f4cf252ccc3cd4d79c330b778 (patch) | |
| tree | b8829866a7052fc0072492df0beecc68b188a3db | |
| parent | 1b8e487e586c1924693d95083ea0e8f3c00fac68 (diff) | |
| download | ATCD-08686a42a5f4040f4cf252ccc3cd4d79c330b778.tar.gz | |
ChangeLogTag: Tue Jan 11 16:46:40 2000 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | TAO/tao/MessagingS.h | 6 | ||||
| -rw-r--r-- | TAO/tao/PollableC.cpp | 10 | ||||
| -rw-r--r-- | TAO/tao/PollableS.cpp | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 0efa60b5fe0..41a304fe128 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Tue Jan 11 16:46:40 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * tao/PollableS.cpp: + * tao/PollableC.cpp: + * tao/MessagingS.h: Fixed compile errors in AMI code. + Tue Jan 11 11:20:27 2000 Irfan Pyarali <irfan@cs.wustl.edu> * performance-tests/RTCorba/Oneways/Reliable/server.cpp (set_rt_mode): diff --git a/TAO/tao/MessagingS.h b/TAO/tao/MessagingS.h index c0dbb5ae462..c99da0a5e34 100644 --- a/TAO/tao/MessagingS.h +++ b/TAO/tao/MessagingS.h @@ -1887,12 +1887,6 @@ private: CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; - virtual void _dispatch ( - CORBA::ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); }; class TAO_Export _tao_collocated_Poller : public virtual Messaging::Poller, diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index ac8cc157519..a7941e67d6a 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -76,7 +76,7 @@ CORBA_Pollable_ptr CORBA_Pollable::_narrow ( CORBA_Pollable_ptr CORBA_Pollable::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env + CORBA::Environment & /*env*/ ) { if (CORBA::is_nil (obj)) @@ -260,7 +260,7 @@ CORBA::DIIPollable_ptr CORBA::DIIPollable::_narrow ( servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/DIIPollable:1.0"); if (servant == 0) { - CORBA::DIIPollable_ptr rval = CORBA_Pollable::_nil (); + CORBA::DIIPollable_ptr rval = CORBA::DIIPollable::_nil (); ACE_NEW_RETURN (rval, CORBA::DIIPollable (stub), @@ -286,7 +286,7 @@ CORBA::DIIPollable_ptr CORBA::DIIPollable::_narrow ( CORBA::DIIPollable_ptr CORBA::DIIPollable::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env + CORBA::Environment & /*env*/ ) { if (CORBA::is_nil (obj)) @@ -298,7 +298,7 @@ CORBA::DIIPollable_ptr CORBA::DIIPollable::_unchecked_narrow ( servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/DIIPollable:1.0"); if (servant == 0) { - CORBA::DIIPollable_ptr rval = CORBA_Pollable::_nil (); + CORBA::DIIPollable_ptr rval = CORBA::DIIPollable::_nil (); ACE_NEW_RETURN (rval, CORBA::DIIPollable (stub), @@ -382,7 +382,7 @@ CORBA_PollableSet_ptr CORBA_PollableSet::_narrow ( CORBA_PollableSet_ptr CORBA_PollableSet::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env + CORBA::Environment & /*env*/ ) { if (CORBA::is_nil (obj)) diff --git a/TAO/tao/PollableS.cpp b/TAO/tao/PollableS.cpp index cb4a354613d..482ff6114fe 100644 --- a/TAO/tao/PollableS.cpp +++ b/TAO/tao/PollableS.cpp @@ -23,7 +23,7 @@ #include "tao/Operation_Table.h" #include "tao/Server_Request.h" - +#include "tao/ORB.h" #if !defined (__ACE_INLINE__) #include "tao/PollableS.i" #endif /* !defined INLINE */ |