diff options
Diffstat (limited to 'TAO/examples/POA/Loader/Servant_Locator.h')
| -rw-r--r-- | TAO/examples/POA/Loader/Servant_Locator.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/TAO/examples/POA/Loader/Servant_Locator.h b/TAO/examples/POA/Loader/Servant_Locator.h index dc72a49eb6e..6c70a3aeb34 100644 --- a/TAO/examples/POA/Loader/Servant_Locator.h +++ b/TAO/examples/POA/Loader/Servant_Locator.h @@ -1,7 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ -// ================================================================ +//================================================================================ // // = LIBRARY // TAO/examples/POA/Loader @@ -16,7 +16,7 @@ // = AUTHOR // Kirthika Parameswaran <kirthika@cs.wustl.edu> // -// ================================================================ +//================================================================================== #include "ace/OS.h" @@ -24,10 +24,9 @@ #define SERVANT_LOCATOR_H #include "tao/corba.h" -#include "tao/PortableServer/PortableServer.h" #include "ace/DLL.h" -class ServantLocator_i : public PortableServer::ServantLocator +class ServantLocator_i : public POA_PortableServer::ServantLocator { // = TITLE // This class is used by a POA with USE_SERVANT_MANAGER and @@ -64,9 +63,7 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie - TAO_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)); + TAO_ENV_ARG_DECL); // This method is invoked by a POA whenever it receives a request // for MyFoo object that is not currently active. When the POA is // created using the NON_RETAIN policy the Active Object Map is not @@ -82,8 +79,7 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); + TAO_ENV_ARG_DECL); // This method is invoked whenever a MyFooServant completes a // request. As the Servant Loactor interface is used when the POA // doesnt maintain the Active Object Map, its necessary to get rid |