1 files changed, 15 insertions, 12 deletions
diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h
index 63c79700296..e120804d184 100644
--- a/TAO/tao/Strategies/DIOP_Transport.h
+++ b/TAO/tao/Strategies/DIOP_Transport.h
@@ -1,6 +1,6 @@
-// This may look like C, but it's really -*- C++ -*-
 // -*- C++ -*-
-// ===================================================================
+
+//=============================================================================
 /**
  *  @file   DIOP_Transport.h
  *
@@ -8,7 +8,7 @@
  *
  *  @author  Michael Kircher
  */
-// ===================================================================
+//=============================================================================
 
 #ifndef TAO_DIOP_TRANSPORT_H
 #define TAO_DIOP_TRANSPORT_H
@@ -17,17 +17,22 @@
 
 #include "tao/orbconf.h"
 
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-#include "tao/Transport.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
+
+#include "tao/Strategies/strategies_export.h"
+#include "tao/Transport.h"
 #include "ace/SOCK_Stream.h"
 #include "ace/Svc_Handler.h"
-#include "strategies_export.h"
+
+#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
+template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward decls.
 class TAO_DIOP_Connection_Handler;
@@ -40,10 +45,6 @@ class TAO_Acceptor;
 typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
         TAO_DIOP_SVC_HANDLER;
 
-#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
-
 /**
  * @class TAO_DIOP_Transport
  *
@@ -135,6 +136,8 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
 
 #include /**/ "ace/post.h"