summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h')
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
index 53e825c0939..19883f8ac3f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
//=============================================================================
/**
@@ -14,8 +14,8 @@
#define TOPOLOGY_OBJECT_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/Notify/Object.h"
-#include "orbsvcs/Notify/Name_Value_Pair.h"
+#include "Object.h"
+#include "Name_Value_Pair.h"
#include "ace/SString.h"
#include "ace/Vector_T.h"
@@ -24,7 +24,6 @@
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
/// \namespace TAO_Notify
/// \brief A namespace to be used by all of TAO's Notification Service
@@ -46,6 +45,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
//
namespace TAO_Notify
{
+ static const ACE_TCHAR TOPOLOGY_ID_NAME[] = ACE_TEXT("TopologyID");
+
class Topology_Saver;
class Topology_Parent;
@@ -202,10 +203,8 @@ namespace TAO_Notify
} // namespace TAO_Notify
-TAO_END_VERSIONED_NAMESPACE_DECL
-
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Topology_Object.inl"
+#include "Topology_Object.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"