diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-14 23:49:23 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-14 23:49:23 +0000 |
| commit | 97f7b9a14101de36a48de8c3c454477dda640308 (patch) | |
| tree | 01edb0f02bae7efea5a1a1ee0fa605861246f8a4 | |
| parent | 8b17e82593343269590f548217e315fbd8b12447 (diff) | |
| download | ATCD-97f7b9a14101de36a48de8c3c454477dda640308.tar.gz | |
Made TAO_HAS_MINIMUM_CORBA guards consistent around all things with
ForwardRequest in them.
| -rw-r--r-- | TAO/tao/POAC.h | 4 | ||||
| -rw-r--r-- | TAO/tao/POAC.i | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h index e3d592ce9a7..3eafc356d92 100644 --- a/TAO/tao/POAC.h +++ b/TAO/tao/POAC.h @@ -2597,9 +2597,13 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::Current_pt TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::Current::NoContext &); // TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::Current::NoContext &); +#if !defined (TAO_HAS_MINIMUM_CORBA) + TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &); +#endif /* TAO_HAS_MINIMUM_CORBA */ + TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::POAManager_ptr ); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::POAManager_ptr &); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::POAManager::State &); // diff --git a/TAO/tao/POAC.i b/TAO/tao/POAC.i index 3c154586aab..52ff6573ef1 100644 --- a/TAO/tao/POAC.i +++ b/TAO/tao/POAC.i @@ -3093,7 +3093,7 @@ PortableServer::Current_out::operator-> (void) // **************************************************************** -#if (TAO_HAS_MINIMUM_POA == 0) +#if !defined (TAO_HAS_MINIMUM_CORBA) ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ForwardRequest &_tao_aggregate) { @@ -3123,7 +3123,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,PortableServer::Forward return 0; } -#endif /* TAO_HAS_MINIMUM_POA == 0 */ +#endif /* TAO_HAS_MINIMUM_CORBA */ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POAManager::AdapterInactive &_tao_aggregate) { |