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 /TAO/tao/PortableServer/Servant_Base.cpp | |
| 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
Diffstat (limited to 'TAO/tao/PortableServer/Servant_Base.cpp')
| -rw-r--r-- | TAO/tao/PortableServer/Servant_Base.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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, |