summaryrefslogtreecommitdiff
path: root/TAO/tao/IIOP_Acceptor.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/IIOP_Acceptor.h')
-rw-r--r--TAO/tao/IIOP_Acceptor.h18
1 files changed, 14 insertions, 4 deletions
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index 8a43ea3cc82..01aea0b40de 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
//=============================================================================
/**
@@ -19,19 +19,25 @@
#define TAO_IIOP_ACCEPTOR_H
#include /**/ "ace/pre.h"
-#include "ace/Acceptor.h"
+
+#include "tao/orbconf.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "ace/SOCK_Acceptor.h"
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
#include "tao/Transport_Acceptor.h"
#include "tao/IIOP_Connection_Handler.h"
#include "tao/Acceptor_Impl.h"
#include "tao/GIOP_Message_Version.h"
+#include "ace/SOCK_Acceptor.h"
+#include "ace/Acceptor.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
/**
* @class TAO_IIOP_Acceptor
*
@@ -240,7 +246,7 @@ protected:
private:
- /// the concrete acceptor, as a pointer to it's base class.
+ /// The concrete acceptor, as a pointer to it's base class.
BASE_ACCEPTOR base_acceptor_;
/// Acceptor strategies.
@@ -251,9 +257,13 @@ private:
//@@ TAO_ACCEPTOR_SPL_DATA_MEMBERS_COPY_HOOK_END
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined(__ACE_INLINE__)
#include "tao/IIOP_Acceptor.i"
#endif /* __ACE_INLINE__ */
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
+
#include /**/ "ace/post.h"
#endif /* TAO_IIOP_ACCEPTOR_H */