diff options
| -rw-r--r-- | TAO/tao/DomainC.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/DomainC.i | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index 2ea586ef571..6b543ba7afe 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -739,7 +739,7 @@ void *CORBA_DomainManager::_tao_QueryInterface (ptr_arith_t type) void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, - &ACE_NESTED_CLASS (::CORBA, DomainManager)::_narrow)) + &CORBA_DomainManager::_narrow)) retv = ACE_reinterpret_cast (void*, this); else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, @@ -1500,7 +1500,7 @@ void *CORBA_ConstructionPolicy::_tao_QueryInterface (ptr_arith_t type) void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, - &ACE_NESTED_CLASS (::CORBA, ConstructionPolicy)::_narrow)) + &CORBA_ConstructionPolicy::_narrow)) retv = ACE_reinterpret_cast (void*, this); else if (type == ACE_reinterpret_cast (ptr_arith_t, diff --git a/TAO/tao/DomainC.i b/TAO/tao/DomainC.i index b3d6133362d..08c89453f73 100644 --- a/TAO/tao/DomainC.i +++ b/TAO/tao/DomainC.i @@ -29,7 +29,7 @@ CORBA_DomainManager::CORBA_DomainManager ( CORBA::Boolean _tao_collocated, TAO_Abstract_ServantBase *servant ) - : CORBA::Object (objref, _tao_collocated, servant) + : CORBA_Object (objref, _tao_collocated, servant) { this->CORBA_DomainManager_setup_collocation (_tao_collocated); } @@ -47,7 +47,7 @@ CORBA_ConstructionPolicy::CORBA_ConstructionPolicy ( CORBA::Boolean _tao_collocated, TAO_Abstract_ServantBase *servant ) - : CORBA::Object_ptr (objref, _tao_collocated, servant) + : CORBA_Object (objref, _tao_collocated, servant) { this->CORBA_ConstructionPolicy_setup_collocation (_tao_collocated); } |