summaryrefslogtreecommitdiff
path: root/ACE
diff options
context:
space:
mode:
authorErik Sohns <eriksohns@fastmail.net>2015-12-01 19:36:18 +0100
committerErik Sohns <eriksohns@fastmail.net>2015-12-01 19:36:18 +0100
commit6cec72188dd5c94b43ce4dcc72fcf87b62f3ef88 (patch)
treea09a3ea5d723aaae2bee1b0252e9c28ae697f919 /ACE
parent3bff6f8cfd6330e506e5f5f86a90fc2f02dd6191 (diff)
downloadATCD-6cec72188dd5c94b43ce4dcc72fcf87b62f3ef88.tar.gz
fix problem with std io when using ACE_OSTREAM_TYPE
Diffstat (limited to 'ACE')
-rw-r--r--ACE/ace/config-macros.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h
index 2fae4892abd..b1d859fff71 100644
--- a/ACE/ace/config-macros.h
+++ b/ACE/ace/config-macros.h
@@ -49,7 +49,11 @@
# if defined (ACE_LACKS_IOSTREAM_TOTALLY)
# define ACE_OSTREAM_TYPE FILE
# else /* ! ACE_LACKS_IOSTREAM_TOTALLY */
+# if defined ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
+# define ACE_OSTREAM_TYPE std::ostream
+# else
# define ACE_OSTREAM_TYPE ostream
+# endif /* ! ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
# endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
#endif /* ! ACE_OSTREAM_TYPE */