summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp')
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp42
1 files changed, 24 insertions, 18 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
index 306b7bd00a6..c37f66d6b8a 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
@@ -12,19 +12,21 @@
//
// ============================================================================
-#include "Storable_Naming_Context_Activator.h"
+#include "orbsvcs/Naming/Storable_Naming_Context_Activator.h"
#if (TAO_HAS_MINIMUM_POA == 0)
-#include "Naming_Context_Interface.h"
-#include "Storable_Naming_Context.h"
-#include "Storable.h"
+#include "orbsvcs/Naming/Naming_Context_Interface.h"
+#include "orbsvcs/Naming/Storable_Naming_Context.h"
+#include "orbsvcs/Naming/Storable.h"
#include "ace/Auto_Ptr.h"
-TAO_Storable_Naming_Context_Activator::
-TAO_Storable_Naming_Context_Activator (CORBA::ORB_ptr orb,
- TAO_Naming_Service_Persistence_Factory *factory,
- const ACE_TCHAR *persistence_directory,
- size_t context_size)
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Storable_Naming_Context_Activator::TAO_Storable_Naming_Context_Activator (
+ CORBA::ORB_ptr orb,
+ TAO_Naming_Service_Persistence_Factory *factory,
+ const ACE_TCHAR *persistence_directory,
+ size_t context_size)
: orb_(orb),
factory_(factory),
persistence_directory_(persistence_directory),
@@ -38,9 +40,10 @@ TAO_Storable_Naming_Context_Activator::~TAO_Storable_Naming_Context_Activator ()
}
PortableServer::Servant
-TAO_Storable_Naming_Context_Activator::incarnate (const PortableServer::ObjectId &oid,
- PortableServer::POA_ptr poa
- ACE_ENV_ARG_DECL)
+TAO_Storable_Naming_Context_Activator::incarnate (
+ const PortableServer::ObjectId &oid,
+ PortableServer::POA_ptr poa
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableServer::ForwardRequest))
{
@@ -103,12 +106,13 @@ TAO_Storable_Naming_Context_Activator::incarnate (const PortableServer::ObjectId
}
void
-TAO_Storable_Naming_Context_Activator::etherealize (const PortableServer::ObjectId &/*oid*/,
- PortableServer::POA_ptr /*adapter*/,
- PortableServer::Servant servant,
- CORBA::Boolean /*cleanup_in_progress*/,
- CORBA::Boolean remaining_activations
- ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Storable_Naming_Context_Activator::etherealize (
+ const PortableServer::ObjectId &/*oid*/,
+ PortableServer::POA_ptr /*adapter*/,
+ PortableServer::Servant servant,
+ CORBA::Boolean /*cleanup_in_progress*/,
+ CORBA::Boolean remaining_activations
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (!remaining_activations) {
@@ -116,4 +120,6 @@ TAO_Storable_Naming_Context_Activator::etherealize (const PortableServer::Object
}
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#endif /* TAO_HAS_MINIMUM_POA */