diff options
Diffstat (limited to 'ace/IOStream.h')
| -rw-r--r-- | ace/IOStream.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/ace/IOStream.h b/ace/IOStream.h index 66aa738227a..49c0612da13 100644 --- a/ace/IOStream.h +++ b/ace/IOStream.h @@ -40,18 +40,26 @@ # if defined (ACE_HAS_STRING_CLASS) # if defined (ACE_WIN32) && defined (_MSC_VER) +ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef CString ACE_IOStream_String; +ACE_END_VERSIONED_NAMESPACE_DECL # else # if !defined (ACE_HAS_STDCPP_STL_INCLUDES) #include /**/ <String.h> +ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef String ACE_IOStream_String; +ACE_END_VERSIONED_NAMESPACE_DECL # else # include /**/ <string> # if defined(ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) +ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef std::string ACE_IOStream_String; +ACE_END_VERSIONED_NAMESPACE_DECL # else +ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef string ACE_IOStream_String; +ACE_END_VERSIONED_NAMESPACE_DECL # endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ # endif /* ! ACE_HAS_STDCPP_STL_INCLUDES */ # endif /* ACE_WIN32 && defined (_MSC_VER) */ @@ -64,6 +72,8 @@ typedef string ACE_IOStream_String; # endif /* __DECCXX_VER < 50700000 */ # endif /* __DECCXX_VER */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + class ACE_Export ACE_Quoted_String : public ACE_IOStream_String { public: @@ -88,11 +98,15 @@ public: # endif /* ACE_WIN32 && defined (_MSC_VER) */ }; +ACE_END_VERSIONED_NAMESPACE_DECL + # endif /* ACE_HAS_STRING_CLASS */ # include "ace/Time_Value.h" # include "ace/os_include/sys/os_types.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class ACE_Streambuf * @@ -202,8 +216,8 @@ public: /// Query the streambuf for the size of its buffers. u_int streambuf_size (void); - /// Did we take an error because of an IO operation timeout? Note: - /// Invoking this resets the flag. + /// Did we take an error because of an IO operation timeout? + /// @note Invoking this resets the flag. u_char timeout (void); protected: @@ -342,6 +356,8 @@ protected: # endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ }; +ACE_END_VERSIONED_NAMESPACE_DECL + /////////////////////////////////////////////////////////////////////////// // These typedefs are provided by G++ (on some systems?) without the |