summaryrefslogtreecommitdiff
path: root/ace/Sockets/SOCK.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ace/Sockets/SOCK.cpp')
-rw-r--r--ace/Sockets/SOCK.cpp29
1 files changed, 25 insertions, 4 deletions
diff --git a/ace/Sockets/SOCK.cpp b/ace/Sockets/SOCK.cpp
index 333ff6c16b5..33236e5cdee 100644
--- a/ace/Sockets/SOCK.cpp
+++ b/ace/Sockets/SOCK.cpp
@@ -1,11 +1,14 @@
// SOCK.cpp
// $Id$
-#include "ace/SOCK.h"
-#include "ace/Log_Msg.h"
+#include "ace/Sockets/SOCK.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
#if defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/SOCK.i"
+#include "ace/Sockets/SOCK.i"
#endif
ACE_RCSID(ace, SOCK, "$Id$")
@@ -117,6 +120,7 @@ ACE_SOCK::ACE_SOCK (int type,
int reuse_addr)
{
// ACE_TRACE ("ACE_SOCK::ACE_SOCK");
+#ifdef ACE_SUBSET_0
if (this->open (type,
protocol_family,
protocol,
@@ -124,6 +128,12 @@ ACE_SOCK::ACE_SOCK (int type,
ACE_ERROR ((LM_ERROR,
ACE_LIB_TEXT ("%p\n"),
ACE_LIB_TEXT ("ACE_SOCK::ACE_SOCK")));
+#else
+ this-open (type,
+ protocol_family,
+ protocol,
+ reuse_addr);
+#endif /* ACE_SUBSET_0 */
}
int
@@ -159,7 +169,7 @@ ACE_SOCK::open (int type,
else
return 0;
}
-
+
ACE_SOCK::ACE_SOCK (int type,
int protocol_family,
int protocol,
@@ -169,6 +179,7 @@ ACE_SOCK::ACE_SOCK (int type,
int reuse_addr)
{
// ACE_TRACE ("ACE_SOCK::ACE_SOCK");
+#ifdef ACE_SUBSET_0
if (this->open (type,
protocol_family,
protocol,
@@ -179,4 +190,14 @@ ACE_SOCK::ACE_SOCK (int type,
ACE_ERROR ((LM_ERROR,
ACE_LIB_TEXT ("%p\n"),
ACE_LIB_TEXT ("ACE_SOCK::ACE_SOCK")));
+#else
+ this->open (type,
+ protocol_family,
+ protocol,
+ protocolinfo,
+ g,
+ flags,
+ reuse_addr);
+#endif /* ACE_SUBSET_0 */
+
}