diff options
Diffstat (limited to 'TAO/tao/PortableServer/POA_Current.h')
| -rw-r--r-- | TAO/tao/PortableServer/POA_Current.h | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h index 4af15a2b241..a8e5583a101 100644 --- a/TAO/tao/PortableServer/POA_Current.h +++ b/TAO/tao/PortableServer/POA_Current.h @@ -15,22 +15,20 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/PS_CurrentC.h" #include "tao/LocalObject.h" +#include "tao/PortableServer/PS_CurrentC.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -38,10 +36,12 @@ namespace TAO class POA_Current_Impl; class TAO_PortableServer_Export POA_Current - : public PortableServer::Current - , public TAO_Local_RefCounted_Object + : public PortableServer::Current, + public TAO_Local_RefCounted_Object { public: + /// Constructor + POA_Current (void); /** * Returns the POA on which the current request is being invoked. @@ -62,19 +62,6 @@ namespace TAO PortableServer::Current::NoContext)); /** - * This operation returns a locally manufactured reference to the object - * in the context of which it is called. If called outside the context - * of a POA dispatched operation, a NoContext exception is raised. - * @note This reference is not guaranteed to be identical to the original - * reference the client used to make the invocation, and calling the - * Object::is_equivalent operation to compare the two references may not - * necessarily return true. - */ - CORBA::Object_ptr get_reference (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::Current::NoContext)); - - /** * Returns a reference to the servant that hosts the object in whose * context it is called. If called outside the context of the POA * dispatched operation, a NoContext exception is raised @@ -93,12 +80,14 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ +#if defined (__ACE_INLINE__) +# include "POA_Current.inl" +#endif /* __ACE_INLINE__ */ + #include /**/ "ace/post.h" #endif /* TAO_POA_CURRENT_H */ |