diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-11-28 12:30:05 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-11-28 12:30:05 +0000 |
| commit | a23609487a6c5a76d3dcbd6fa28345c7d3207b6b (patch) | |
| tree | 779656182af8ff3324e97a632896fe4418fa5ae0 | |
| parent | 7916de42d8cf765c2b61cbce90bf322e600208c2 (diff) | |
| download | ATCD-a23609487a6c5a76d3dcbd6fa28345c7d3207b6b.tar.gz | |
Mon Nov 28 12:28:14 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/PortableServer/Servant_Base.h:
* tao/PortableServer/Servant_Base.cpp:
Disable serveral methods with CORBA/e or minimum corba, fixes
bugzilla 3019
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Servant_Base.cpp | 5 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Servant_Base.h | 4 |
3 files changed, 15 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index fa7cfa79798..ca6ab2f204e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Mon Nov 28 12:28:14 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/PortableServer/Servant_Base.h: + * tao/PortableServer/Servant_Base.cpp: + Disable serveral methods with CORBA/e or minimum corba, fixes + bugzilla 3019 + Mon Nov 28 10:49:43 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * MPC/config/taobaseidldefaults.mpb: diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 596058997e6..5d9fe1002a6 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -433,6 +433,7 @@ TAO_ServantBase::_is_a (const char *logical_type_id) return ACE_OS::strcmp (logical_type_id, id) == 0; } +#if (TAO_HAS_MINIMUM_CORBA == 0) CORBA::Boolean TAO_ServantBase::_non_existent (void) { @@ -457,17 +458,19 @@ TAO_ServantBase::_get_interface (void) this->_interface_repository_id ()); } +#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) CORBA::Object_ptr TAO_ServantBase::_get_component (void) { return CORBA::Object::_nil (); } - +#endif char * TAO_ServantBase::_repository_id (void) { return CORBA::string_dup (this->_interface_repository_id ()); } +#endif /* TAO_HAS_MINIMUM_CORBA */ int TAO_ServantBase::_find (const char *opname, diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h index 9755cb393f6..59718ff0ae2 100644 --- a/TAO/tao/PortableServer/Servant_Base.h +++ b/TAO/tao/PortableServer/Servant_Base.h @@ -112,17 +112,21 @@ public: /// Local implementation of the CORBA::Object::_is_a method. virtual CORBA::Boolean _is_a (const char *logical_type_id); +#if (TAO_HAS_MINIMUM_CORBA == 0) /// Default _non_existent: always returns false. virtual CORBA::Boolean _non_existent (void); /// Query the Interface Repository for the interface definition. virtual CORBA::InterfaceDef_ptr _get_interface (void); +#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) /// Default _get_component: always returns CORBA::Object::_nil(). virtual CORBA::Object_ptr _get_component (void); +#endif /// Get the repository id. virtual char * _repository_id (void); +#endif /* TAO_HAS_MINIMUM_CORBA */ /// This is an auxiliary method for _this() and _narrow(). virtual TAO_Stub *_create_stub (void); |