diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h index a0bff3fb0c8..92e2bf0ad6d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h @@ -12,14 +12,16 @@ #ifndef FT_PROXYADMIN_H #define FT_PROXYADMIN_H -#include "FT_ProxyAdmin_Base.h" +#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h" #include "../Utils/ScopeGuard.h" -#include "Request_Context_Repository.h" +#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class EC_PROXY_ADMIN, class Proxy, class ProxyInterface, class State> class FT_ProxyAdmin : public FT_ProxyAdmin_Base @@ -31,8 +33,7 @@ public: FT_ProxyAdmin(EC_PROXY_ADMIN* admin, PortableServer::POA_var poa); - ProxyInterface_ptr - obtain_proxy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + ProxyInterface_ptr obtain_proxy (ACE_ENV_SINGLE_ARG_DECL); /// this is used for updating the state void obtain_proxy (const FtRtecEventChannelAdmin::Operation& op @@ -44,8 +45,10 @@ private: EC_PROXY_ADMIN* admin_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "FT_ProxyAdmin_T.cpp" +#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) |