summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-04-11 18:19:17 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-04-11 19:20:07 (GMT)
commit857e44c156a1dbefcb49bb5792c4384cebd8762a (patch)
tree11947fb81ad9c502627f1b2bb8f090fb8d53c107 /3rdParty/Boost/src/boost/asio/ip/detail
parent77d4eb7588e113beaa03f3347523b26adefdeb06 (diff)
downloadswift-contrib-857e44c156a1dbefcb49bb5792c4384cebd8762a.zip
swift-contrib-857e44c156a1dbefcb49bb5792c4384cebd8762a.tar.bz2
Updated Boost to 1.42.
Diffstat (limited to '3rdParty/Boost/src/boost/asio/ip/detail')
-rw-r--r--3rdParty/Boost/src/boost/asio/ip/detail/socket_option.hpp36
1 files changed, 26 insertions, 10 deletions
diff --git a/3rdParty/Boost/src/boost/asio/ip/detail/socket_option.hpp b/3rdParty/Boost/src/boost/asio/ip/detail/socket_option.hpp
index 40226fe..0c26864 100644
--- a/3rdParty/Boost/src/boost/asio/ip/detail/socket_option.hpp
+++ b/3rdParty/Boost/src/boost/asio/ip/detail/socket_option.hpp
@@ -2,7 +2,7 @@
// socket_option.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)
@@ -21,6 +21,7 @@
#include <cstddef>
#include <cstring>
#include <boost/config.hpp>
+#include <boost/throw_exception.hpp>
#include <boost/asio/detail/pop_options.hpp>
#include <boost/asio/ip/address.hpp>
@@ -142,8 +143,8 @@ public:
{
if (s != sizeof(ipv6_value_))
{
- throw std::length_error(
- "multicast_enable_loopback socket option resize");
+ std::length_error ex("multicast_enable_loopback socket option resize");
+ boost::throw_exception(ex);
}
ipv4_value_ = ipv6_value_ ? 1 : 0;
}
@@ -151,8 +152,8 @@ public:
{
if (s != sizeof(ipv4_value_))
{
- throw std::length_error(
- "multicast_enable_loopback socket option resize");
+ std::length_error ex("multicast_enable_loopback socket option resize");
+ boost::throw_exception(ex);
}
ipv6_value_ = ipv4_value_ ? 1 : 0;
}
@@ -237,7 +238,10 @@ public:
void resize(const Protocol&, std::size_t s)
{
if (s != sizeof(value_))
- throw std::length_error("unicast hops socket option resize");
+ {
+ std::length_error ex("unicast hops socket option resize");
+ boost::throw_exception(ex);
+ }
#if defined(__hpux)
if (value_ < 0)
value_ = value_ & 0xFF;
@@ -271,7 +275,10 @@ public:
explicit multicast_hops(int v)
{
if (v < 0 || v > 255)
- throw std::out_of_range("multicast hops value out of range");
+ {
+ std::out_of_range ex("multicast hops value out of range");
+ boost::throw_exception(ex);
+ }
ipv4_value_ = (ipv4_value_type)v;
ipv6_value_ = v;
}
@@ -280,7 +287,10 @@ public:
multicast_hops& operator=(int v)
{
if (v < 0 || v > 255)
- throw std::out_of_range("multicast hops value out of range");
+ {
+ std::out_of_range ex("multicast hops value out of range");
+ boost::throw_exception(ex);
+ }
ipv4_value_ = (ipv4_value_type)v;
ipv6_value_ = v;
return *this;
@@ -344,7 +354,10 @@ public:
if (protocol.family() == PF_INET6)
{
if (s != sizeof(ipv6_value_))
- throw std::length_error("multicast hops socket option resize");
+ {
+ std::length_error ex("multicast hops socket option resize");
+ boost::throw_exception(ex);
+ }
if (ipv6_value_ < 0)
ipv4_value_ = 0;
else if (ipv6_value_ > 255)
@@ -355,7 +368,10 @@ public:
else
{
if (s != sizeof(ipv4_value_))
- throw std::length_error("multicast hops socket option resize");
+ {
+ std::length_error ex("multicast hops socket option resize");
+ boost::throw_exception(ex);
+ }
ipv6_value_ = ipv4_value_;
}
}