| Summary: | Make methods in TAO_ServantBase optional | ||
|---|---|---|---|
| Product: | TAO | Reporter: | Johnny Willemsen <jwillemsen> |
| Component: | ORB | Assignee: | Marcel Smit <msmit> |
| Status: | RESOLVED FIXED | ||
| Severity: | minor | ||
| Priority: | P3 | ||
| Version: | 2.0.5 | ||
| Hardware: | All | ||
| OS: | All | ||
| Bug Depends on: | 2460 | ||
| Bug Blocks: | |||
Marcel, can you do this with the current set of changes, all generated code is out of the repository 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 |
Revert the changes below when all generated files are out of the repository and generated as part of the build Index: Servant_Base.cpp =================================================================== --- Servant_Base.cpp (revision 79123) +++ Servant_Base.cpp (working copy) @@ -87,7 +87,6 @@ return ACE_OS::strcmp (logical_type_id, id) == 0; } -#if (TAO_HAS_MINIMUM_CORBA == 0) CORBA::Boolean TAO_ServantBase::_non_existent (void) { @@ -112,20 +111,17 @@ 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, Index: Servant_Base.h =================================================================== --- Servant_Base.h (revision 79123) +++ Servant_Base.h (working copy) @@ -72,21 +72,17 @@ /// 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);