1 files changed, 4 insertions, 11 deletions
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
index 9e334a307a7..73f041dca16 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   Connection_Timeout_Policy_i.h
@@ -12,7 +11,6 @@
 
 #ifndef TAO_CONNECTION_TIMEOUT_POLICY_I_H
 #define TAO_CONNECTION_TIMEOUT_POLICY_I_H
-
 #include /**/ "ace/pre.h"
 
 #include "tao/orbconf.h"
@@ -21,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Messaging/TAO_ExtC.h"
+#include "TAO_ExtC.h"
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
@@ -32,8 +30,6 @@
 
 #if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /*
  * @class TAO_ConnectionTimeoutPolicy
  *
@@ -42,7 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *  This policy controls the connection timeout time while
  *  establishing connections. This policy is proprietary to TAO.
  */
-class TAO_ConnectionTimeoutPolicy
+class TAO_Messaging_Export TAO_ConnectionTimeoutPolicy
   : public TAO::ConnectionTimeoutPolicy,
     public TAO_Local_RefCounted_Object
 {
@@ -93,8 +89,6 @@ private:
   TimeBase::TimeT relative_expiry_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
 #if defined(_MSC_VER)
@@ -102,5 +96,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
-
-#endif  /* TAO_CONNECTION_TIMEOUT_POLICY_I_H */
+#endif /*TAO_CONNECTION_TIMEOUT_POLICY_I_H*/