diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-09-01 19:19:44 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-09-01 19:19:44 +0000 |
| commit | ca97179eb8b9fd97e7c57f588500431b32388de7 (patch) | |
| tree | f19ab7af6ac505dee78dab2e5113041352537a22 | |
| parent | 7fa46bc06d5d64a042567e09cc0a16d9883400d8 (diff) | |
| download | ATCD-ca97179eb8b9fd97e7c57f588500431b32388de7.tar.gz | |
ChangeLogTag:Fri Sep 1 14:18:35 2000 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 11 | ||||
| -rw-r--r-- | TAO/tao/DomainC.h | 5 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Object_Adapter.h | 2 |
3 files changed, 18 insertions, 0 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 33cb37f3dd7..ccf72883be2 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,14 @@ +Fri Sep 1 14:18:35 2000 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/PortableServer/Object_Adapter.h: + Add missing include. It went undetected because platforms that + define ACE_TEMPLATES_REQUIRE_SOURCE got it automagically + included. + + * tao/DomainC.h: + Some extern declaration should only be made if __ACE_INLINE__ is + not defined. + Fri Sep 1 11:26:54 2000 Carlos O'Ryan <coryan@uci.edu> * tao/DomainC.h: diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index 04e3a916fe9..ecadbf0cfa7 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -530,6 +530,9 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_DomainManager * extern TAO_Export CORBA_ConstructionPolicy_ptr (*_TAO_collocation_CORBA_ConstructionPolicy_Stub_Factory_function_pointer) ( CORBA::Object_ptr obj ); + +#ifndef __ACE_INLINE__ + // Any operators for interface CORBA_ConstructionPolicy TAO_Export void operator<<= (CORBA::Any &, CORBA_ConstructionPolicy_ptr); TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ConstructionPolicy *&); @@ -537,6 +540,8 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ConstructionPol TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ConstructionPolicy_ptr ); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ConstructionPolicy_ptr &); +#endif /* __ACE_INLINE__ */ + #endif /* TAO_HAS_MINIMUM_CORBA */ TAO_Export void operator<<= (CORBA::Any &, const CORBA_DomainManagerList &); // copying version diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h index 546e6bbba0a..9064b0e5cb8 100644 --- a/TAO/tao/PortableServer/Object_Adapter.h +++ b/TAO/tao/PortableServer/Object_Adapter.h @@ -44,6 +44,8 @@ // Local Object #include "tao/LocalObject.h" +#include "ace/Service_Config.h" + #if defined(_MSC_VER) #if (_MSC_VER >= 1200) #pragma warning(push) |