diff options
| author | jxh <jxh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-12-12 10:22:23 +0000 |
|---|---|---|
| committer | jxh <jxh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-12-12 10:22:23 +0000 |
| commit | 560a530f20da745881530d1f52ede31d76cf9796 (patch) | |
| tree | f065b940d77d90ae98c578d0e44c9a52aad8c78c /ace/IOStream.h | |
| parent | b527c191b5302dfe8eca5144cf11018ec5020a4d (diff) | |
| download | ATCD-560a530f20da745881530d1f52ede31d76cf9796.tar.gz | |
Added #if's to handle the case where ACE_HAS_STRING_CLASS, but if
ACE_HAS_STDCPP_STL_INCLUDES, then the string class is found in
<string>. Otherwise, it looks for it in <String.h>.
Diffstat (limited to 'ace/IOStream.h')
| -rw-r--r-- | ace/IOStream.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ace/IOStream.h b/ace/IOStream.h index 7850dd4a69b..f73b71569c8 100644 --- a/ace/IOStream.h +++ b/ace/IOStream.h @@ -28,12 +28,14 @@ #if defined (ACE_HAS_STRING_CLASS) #if defined (ACE_WIN32) typedef CString ACE_IOStream_String; -#elif defined (ACE_HAS_STANDARD_CPP_LIBRARY) && defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -#include /**/ <string> -typedef std::string ACE_IOStream_String; #else +#if !defined (ACE_HAS_STDCPP_STL_INCLUDES) #include /**/ <String.h> typedef String ACE_IOStream_String; +#else +#include /**/ <string> +typedef string ACE_IOStream_String; +#endif /* ! ACE_HAS_STDCPP_STL_INCLUDES */ #endif /* ACE_WIN32 */ #if defined (DEC_CXX) |