summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/Boost/src/boost/asio/error.hpp')
-rw-r--r--3rdParty/Boost/src/boost/asio/error.hpp26
1 files changed, 5 insertions, 21 deletions
diff --git a/3rdParty/Boost/src/boost/asio/error.hpp b/3rdParty/Boost/src/boost/asio/error.hpp
index d0287a0..331297b 100644
--- a/3rdParty/Boost/src/boost/asio/error.hpp
+++ b/3rdParty/Boost/src/boost/asio/error.hpp
@@ -2,7 +2,7 @@
// error.hpp
// ~~~~~~~~~
//
-// Copyright (c) 2003-2011 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2012 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)
@@ -211,10 +211,6 @@ enum misc_errors
fd_set_failure
};
-enum ssl_errors
-{
-};
-
inline const boost::system::error_category& get_system_category()
{
return boost::system::system_category();
@@ -245,9 +241,6 @@ inline const boost::system::error_category& get_addrinfo_category()
extern BOOST_ASIO_DECL
const boost::system::error_category& get_misc_category();
-extern BOOST_ASIO_DECL
-const boost::system::error_category& get_ssl_category();
-
static const boost::system::error_category& system_category
= boost::asio::error::get_system_category();
static const boost::system::error_category& netdb_category
@@ -256,12 +249,12 @@ static const boost::system::error_category& addrinfo_category
= boost::asio::error::get_addrinfo_category();
static const boost::system::error_category& misc_category
= boost::asio::error::get_misc_category();
-static const boost::system::error_category& ssl_category
- = boost::asio::error::get_ssl_category();
} // namespace error
} // namespace asio
+} // namespace boost
+namespace boost {
namespace system {
template<> struct is_error_code_enum<boost::asio::error::basic_errors>
@@ -284,13 +277,10 @@ template<> struct is_error_code_enum<boost::asio::error::misc_errors>
static const bool value = true;
};
-template<> struct is_error_code_enum<boost::asio::error::ssl_errors>
-{
- static const bool value = true;
-};
-
} // namespace system
+} // namespace boost
+namespace boost {
namespace asio {
namespace error {
@@ -318,12 +308,6 @@ inline boost::system::error_code make_error_code(misc_errors e)
static_cast<int>(e), get_misc_category());
}
-inline boost::system::error_code make_error_code(ssl_errors e)
-{
- return boost::system::error_code(
- static_cast<int>(e), get_ssl_category());
-}
-
} // namespace error
} // namespace asio
} // namespace boost