diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-02-22 17:50:52 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-02-22 17:50:52 +0000 |
| commit | 27235a580f64c43b2a11d551c3a7cd81b15739c3 (patch) | |
| tree | 928e2a5c3a26cadc1977755c20f68da0e86d0550 | |
| parent | e2c866440d5703478e8ef0e9da47c4d590454865 (diff) | |
| download | ATCD-27235a580f64c43b2a11d551c3a7cd81b15739c3.tar.gz | |
ChangeLogTag:Sat Feb 22 09:50:31 2003 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Collocated_Object.cpp | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ba1aa097377..921f76cea85 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Sat Feb 22 09:50:31 2003 Ossama Othman <ossama@uci.edu> + + * tao/PortableServer/Collocated_Object.cpp (_get_component): + (_is_equivalent, _tao_QueryInterface): + + Wrapped remaining CORBA::Object base class method calls with the + ACE_NESTED_CLASS macro. Addresses remaining problems in Borland + C++ builds. + Sat Feb 22 09:37:29 2003 Ossama Othman <ossama@uci.edu> * tao/ORB.h (ORB): diff --git a/TAO/tao/PortableServer/Collocated_Object.cpp b/TAO/tao/PortableServer/Collocated_Object.cpp index db0feda015b..0fa5d53e912 100644 --- a/TAO/tao/PortableServer/Collocated_Object.cpp +++ b/TAO/tao/PortableServer/Collocated_Object.cpp @@ -88,7 +88,7 @@ TAO_Collocated_Object::_is_equivalent (CORBA::Object_ptr other_obj ACE_THROW_SPEC (()) { CORBA::Boolean equivalent = - this->Object::_is_equivalent (other_obj ACE_ENV_ARG_PARAMETER); + this->ACE_NESTED_CLASS (CORBA, Object)::_is_equivalent (other_obj ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (equivalent) @@ -118,7 +118,7 @@ TAO_Collocated_Object::_non_existent (ACE_ENV_SINGLE_ARG_DECL) { // If the object is collocated then try locally.... if (!this->_is_collocated ()) - return this->Object::_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->ACE_NESTED_CLASS (CORBA, Object)::_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_Stub *stub = this->_stubobj (); @@ -170,7 +170,7 @@ TAO_Collocated_Object::_get_component (ACE_ENV_SINGLE_ARG_DECL) // If the object is collocated then try locally.... if (!this->_is_collocated ()) - return this->Object::_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->ACE_NESTED_CLASS (CORBA, Object)::_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_Stub *stub = this->_stubobj (); @@ -213,7 +213,7 @@ TAO_Collocated_Object::_tao_QueryInterface (ptr_arith_t query_type) return this; } - return this->Object::_tao_QueryInterface (query_type); + return this->ACE_NESTED_CLASS (CORBA, Object)::_tao_QueryInterface (query_type); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) |