diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-02-22 15:13:41 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-02-22 15:13:41 +0000 |
| commit | 466489ad4faab09ff14892d0afc01fa765771ba7 (patch) | |
| tree | 05340e102bf02c765693c432a18da748881e99d4 | |
| parent | 76fbef602cded480d0c83c1afda18d3ce17aa8b7 (diff) | |
| download | ATCD-466489ad4faab09ff14892d0afc01fa765771ba7.tar.gz | |
ChangeLogTag: Tue Feb 22 15:13:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/tao/PortableServer/Servant_Upcall.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Servant_Upcall.h | 8 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Servant_Upcall.inl | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp index 05ed0876e55..2ef7d128522 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Servant_Upcall.cpp @@ -233,9 +233,9 @@ namespace TAO { } - TAO_Root_POA * + ::TAO_Root_POA * Servant_Upcall::lookup_POA (const TAO::ObjectKey &key - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Acquire the object adapter lock first. int result = this->object_adapter_->lock ().acquire (); diff --git a/TAO/tao/PortableServer/Servant_Upcall.h b/TAO/tao/PortableServer/Servant_Upcall.h index 45e4c4bd46b..3d5e337202b 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.h +++ b/TAO/tao/PortableServer/Servant_Upcall.h @@ -109,11 +109,11 @@ namespace TAO void post_invoke (void); /// Locate POA. - TAO_Root_POA *lookup_POA (const TAO::ObjectKey &key - ACE_ENV_ARG_DECL); + ::TAO_Root_POA *lookup_POA (const TAO::ObjectKey &key + ACE_ENV_ARG_DECL); /// POA accessor. - TAO_Root_POA &poa (void) const; + ::TAO_Root_POA &poa (void) const; /// Object Adapter accessor. TAO_Object_Adapter &object_adapter (void) const; @@ -187,7 +187,7 @@ namespace TAO TAO_Object_Adapter *object_adapter_; - TAO_Root_POA *poa_; + ::TAO_Root_POA *poa_; PortableServer::Servant servant_; diff --git a/TAO/tao/PortableServer/Servant_Upcall.inl b/TAO/tao/PortableServer/Servant_Upcall.inl index 07b5c49384b..36c4739f457 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.inl +++ b/TAO/tao/PortableServer/Servant_Upcall.inl @@ -6,7 +6,7 @@ namespace TAO { namespace Portable_Server { - ACE_INLINE TAO_Root_POA & + ACE_INLINE ::TAO_Root_POA & Servant_Upcall::poa (void) const { return *this->poa_; |