summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h')
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
index 5d7c3919fb6..9777c7244d5 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
//=============================================================================
/**
@@ -11,7 +11,7 @@
*
* @author Nagarajan Surendran (naga@cs.wustl.edu)
* @author Matt Braun <mjb2@cs.wustl.edu>
- * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>.
+ * @author and Douglas C. Schmidt <schmidt@cs.wustl.edu>.
*/
//=============================================================================
@@ -23,10 +23,8 @@
#include "tao/ORB.h"
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/IOR_Multicast.h"
-#include "orbsvcs/Naming/Naming_Context_Interface.h"
-#include "orbsvcs/Naming/nsconf.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Naming_Context_Interface.h"
+#include "nsconf.h"
// Forward decl;
class TAO_Persistent_Context_Index;
@@ -233,7 +231,5 @@ protected:
int use_round_trip_timeout_;
};
-TAO_END_VERSIONED_NAMESPACE_DECL
-
#include /**/ "ace/post.h"
#endif /* TAO_NAMING_SERVER_H */