diff options
Diffstat (limited to 'ace/IOStream.h')
| -rw-r--r-- | ace/IOStream.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/ace/IOStream.h b/ace/IOStream.h index 49c0612da13..66aa738227a 100644 --- a/ace/IOStream.h +++ b/ace/IOStream.h @@ -40,26 +40,18 @@ # 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) */ @@ -72,8 +64,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL # endif /* __DECCXX_VER < 50700000 */ # endif /* __DECCXX_VER */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - class ACE_Export ACE_Quoted_String : public ACE_IOStream_String { public: @@ -98,15 +88,11 @@ 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 * @@ -216,8 +202,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: @@ -356,8 +342,6 @@ protected: # endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ }; -ACE_END_VERSIONED_NAMESPACE_DECL - /////////////////////////////////////////////////////////////////////////// // These typedefs are provided by G++ (on some systems?) without the |