summaryrefslogtreecommitdiff
path: root/ace/IOStream.h
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-01-23 12:27:09 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-01-23 12:27:09 +0000
commit1cfda5d05bba7530fdb5ca0612b54ab091ea920e (patch)
tree1ecb5da3dacc6932aefc300cf866ffe3bdea58b1 /ace/IOStream.h
parentf73bf1eec04763d0c6894f0d9ca4a36fe03ed3cf (diff)
downloadATCD-1cfda5d05bba7530fdb5ca0612b54ab091ea920e.tar.gz
use std::string if ACE_USES_STD_NAMESPACE_FORSTDCPP_LIB
Diffstat (limited to 'ace/IOStream.h')
-rw-r--r--ace/IOStream.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/ace/IOStream.h b/ace/IOStream.h
index 30560b580a0..8f276477622 100644
--- a/ace/IOStream.h
+++ b/ace/IOStream.h
@@ -34,7 +34,12 @@ typedef CString ACE_IOStream_String;
typedef String ACE_IOStream_String;
#else
#include /**/ <string>
+
+#if defined(ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
+typedef std::string ACE_IOStream_String;
+#else
typedef string ACE_IOStream_String;
+#endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
#endif /* ! ACE_HAS_STDCPP_STL_INCLUDES */
#endif /* ACE_WIN32 */