diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-07 20:32:40 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-07 20:32:40 +0000 |
| commit | bc69483efe440d078ee1750f587d8beb711378b6 (patch) | |
| tree | bf1ee601954129f6cbcf0de1b3c7d75bdb4c18f2 | |
| parent | 90239344d42bdf5c22cdb2c4655febedf031cb5c (diff) | |
| download | ATCD-bc69483efe440d078ee1750f587d8beb711378b6.tar.gz | |
ChangeLogTag:Wed Apr 07 15:17:02 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 7 | ||||
| -rw-r--r-- | TAO/tao/POA_CORBA.h | 4 | ||||
| -rw-r--r-- | TAO/tao/Typecode_Constants.cpp | 7 |
3 files changed, 16 insertions, 2 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index a7c06e7def6..d4e92774af9 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,10 @@ +Wed Apr 07 15:17:02 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/POA_CORBA.h: + * tao/Typecode_Constants.cpp: + Fixed problems with the (unimplemented) CORBA::Poller and + friends. Thanks to Darrell for pointing this out. + Wed Apr 7 15:13:23 1999 Ossama Othman <othman@cs.wustl.edu> * configure.in: diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h index 88c181e9a7f..e18670f0b21 100644 --- a/TAO/tao/POA_CORBA.h +++ b/TAO/tao/POA_CORBA.h @@ -31,9 +31,11 @@ #include "tao/CurrentC.h" #include "tao/PolicyC.h" -#include "tao/PollableC.h" #include "tao/DynAnyC.h" #include "tao/Servant_Base.h" +#if defined(TAO_POLLER) +#include "tao/PollableC.h" +#endif /* TAO_POLLER */ #if defined(_MSC_VER) #pragma warning(disable:4250) diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp index 80850076341..a7f5960cb07 100644 --- a/TAO/tao/Typecode_Constants.cpp +++ b/TAO/tao/Typecode_Constants.cpp @@ -32,8 +32,10 @@ #include "tao/Object.h" #include "tao/Object_KeyC.h" #include "tao/PolicyC.h" -#include "tao/PollableC.h" #include "tao/CurrentC.h" +#if defined(TAO_POLLER) +#include "tao/PollableC.h" +#endif /* TAO_POLLER */ ACE_RCSID(tao, Typecode_Constants, "$Id$") @@ -462,6 +464,7 @@ TAO_TypeCodes::init (void) // **************************************************************** +#if defined(TAO_POLLER) static const CORBA::Long _oc_CORBA_Pollable[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -497,6 +500,8 @@ TAO_TypeCodes::init (void) CORBA::_tc_PollableSet = new CORBA::TypeCode (CORBA::tk_objref, sizeof (_oc_CORBA_PollableSet), (char *) &_oc_CORBA_PollableSet, 0, sizeof (CORBA_PollableSet)); +#endif /* TAO_POLLER */ + // **************************************************************** static const CORBA::Long _oc_CORBA_Current[] = |