summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/Boost/src/boost/asio/basic_streambuf.hpp')
-rw-r--r--3rdParty/Boost/src/boost/asio/basic_streambuf.hpp18
1 files changed, 14 insertions, 4 deletions
diff --git a/3rdParty/Boost/src/boost/asio/basic_streambuf.hpp b/3rdParty/Boost/src/boost/asio/basic_streambuf.hpp
index db0e0c5..e5f8a8d 100644
--- a/3rdParty/Boost/src/boost/asio/basic_streambuf.hpp
+++ b/3rdParty/Boost/src/boost/asio/basic_streambuf.hpp
@@ -2,7 +2,7 @@
// basic_streambuf.hpp
// ~~~~~~~~~~~~~~~~~~~
//
-// Copyright (c) 2003-2008 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2010 Christopher M. Kohlhoff (chris at kohlhoff dot com)
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -18,13 +18,20 @@
#include <boost/asio/detail/push_options.hpp>
#include <boost/asio/detail/push_options.hpp>
+#include <boost/config.hpp>
+#include <boost/asio/detail/pop_options.hpp>
+
+#if !defined(BOOST_NO_IOSTREAM)
+
+#include <boost/asio/detail/push_options.hpp>
#include <algorithm>
#include <cstring>
-#include <limits>
#include <memory>
#include <stdexcept>
#include <streambuf>
#include <vector>
+#include <boost/limits.hpp>
+#include <boost/throw_exception.hpp>
#include <boost/asio/detail/pop_options.hpp>
#include <boost/asio/buffer.hpp>
@@ -89,7 +96,7 @@ namespace asio {
* boost::asio::streambuf b;
*
* // reserve 512 bytes in output sequence
- * boost::asio::streambuf::const_buffers_type bufs = b.prepare(512);
+ * boost::asio::streambuf::mutable_buffers_type bufs = b.prepare(512);
*
* size_t n = sock.receive(bufs);
*
@@ -318,7 +325,8 @@ protected:
}
else
{
- throw std::length_error("boost::asio::streambuf too long");
+ std::length_error ex("boost::asio::streambuf too long");
+ boost::throw_exception(ex);
}
}
@@ -337,4 +345,6 @@ private:
#include <boost/asio/detail/pop_options.hpp>
+#endif // !defined(BOOST_NO_IOSTREAM)
+
#endif // BOOST_ASIO_BASIC_STREAMBUF_HPP