Update of /cvsroot/boost/boost/libs/asio/test/ip
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17073/libs/asio/test/ip
Modified Files:
address_v4.cpp address_v6.cpp host_name.cpp tcp.cpp udp.cpp
Log Message:
Change error handling to match TR2 proposal.
Index: address_v4.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/asio/test/ip/address_v4.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- address_v4.cpp 4 Nov 2006 07:14:10 -0000 1.1
+++ address_v4.cpp 8 Nov 2006 05:32:17 -0000 1.2
@@ -30,14 +30,12 @@
using namespace boost::asio;
-void error_handler(const error&)
-{
-}
-
void test()
{
try
{
+ boost::system::error_code ec;
+
// address_v4 constructors.
ip::address_v4 addr1;
@@ -67,14 +65,14 @@
(void)ulong_value;
std::string string_value = addr1.to_string();
- string_value = addr1.to_string(error_handler);
+ string_value = addr1.to_string(ec);
// address_v4 static functions.
addr1 = ip::address_v4::from_string("127.0.0.1");
- addr1 = ip::address_v4::from_string("127.0.0.1", error_handler);
+ addr1 = ip::address_v4::from_string("127.0.0.1", ec);
addr1 = ip::address_v4::from_string(string_value);
- addr1 = ip::address_v4::from_string(string_value, error_handler);
+ addr1 = ip::address_v4::from_string(string_value, ec);
addr1 = ip::address_v4::any();
Index: address_v6.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/asio/test/ip/address_v6.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- address_v6.cpp 4 Nov 2006 07:14:10 -0000 1.1
+++ address_v6.cpp 8 Nov 2006 05:32:17 -0000 1.2
@@ -29,14 +29,12 @@
using namespace boost::asio;
-void error_handler(const error&)
-{
-}
-
void test()
{
try
{
+ boost::system::error_code ec;
+
// address_v6 constructors.
ip::address_v6 addr1;
@@ -88,16 +86,16 @@
(void)bytes_value;
std::string string_value = addr1.to_string();
- string_value = addr1.to_string(error_handler);
+ string_value = addr1.to_string(ec);
ip::address_v4 addr3 = addr1.to_v4();
// address_v6 static functions.
addr1 = ip::address_v6::from_string("0::0");
- addr1 = ip::address_v6::from_string("0::0", error_handler);
+ addr1 = ip::address_v6::from_string("0::0", ec);
addr1 = ip::address_v6::from_string(string_value);
- addr1 = ip::address_v6::from_string(string_value, error_handler);
+ addr1 = ip::address_v6::from_string(string_value, ec);
addr1 = ip::address_v6::any();
Index: host_name.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/asio/test/ip/host_name.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- host_name.cpp 4 Nov 2006 07:14:10 -0000 1.1
+++ host_name.cpp 8 Nov 2006 05:32:17 -0000 1.2
@@ -34,8 +34,10 @@
{
try
{
+ boost::system::error_code ec;
+
std::string host_name = ip::host_name();
- std::string host_name2 = ip::host_name(boost::asio::ignore_error());
+ std::string host_name2 = ip::host_name(ec);
}
catch (std::exception&)
{
Index: tcp.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/asio/test/ip/tcp.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tcp.cpp 4 Nov 2006 07:14:10 -0000 1.1
+++ tcp.cpp 8 Nov 2006 05:32:17 -0000 1.2
@@ -32,27 +32,23 @@
using namespace boost::asio;
-void error_handler(const error&)
-{
-}
-
-void connect_handler(const error&)
+void connect_handler(const boost::system::error_code&)
{
}
-void send_handler(const error&, std::size_t)
+void send_handler(const boost::system::error_code&, std::size_t)
{
}
-void receive_handler(const error&, std::size_t)
+void receive_handler(const boost::system::error_code&, std::size_t)
{
}
-void write_some_handler(const error&, std::size_t)
+void write_some_handler(const boost::system::error_code&, std::size_t)
{
}
-void read_some_handler(const error&, std::size_t)
+void read_some_handler(const boost::system::error_code&, std::size_t)
{
}
@@ -66,6 +62,7 @@
socket_base::message_flags in_flags = 0;
socket_base::keep_alive socket_option;
socket_base::bytes_readable io_control_command;
+ boost::system::error_code ec;
// basic_stream_socket constructors.
@@ -89,53 +86,53 @@
socket1.open(ip::tcp::v4());
socket1.open(ip::tcp::v6());
- socket1.open(ip::tcp::v4(), error_handler);
- socket1.open(ip::tcp::v6(), error_handler);
+ socket1.open(ip::tcp::v4(), ec);
+ socket1.open(ip::tcp::v6(), ec);
int native_socket2 = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
socket1.assign(ip::tcp::v4(), native_socket2);
int native_socket3 = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
- socket1.assign(ip::tcp::v4(), native_socket3, error_handler);
+ socket1.assign(ip::tcp::v4(), native_socket3, ec);
socket1.close();
- socket1.close(error_handler);
+ socket1.close(ec);
ip::tcp::socket::native_type native_socket4 = socket1.native();
(void)native_socket4;
socket1.cancel();
- socket1.cancel(error_handler);
+ socket1.cancel(ec);
socket1.bind(ip::tcp::endpoint(ip::tcp::v4(), 0));
socket1.bind(ip::tcp::endpoint(ip::tcp::v6(), 0));
- socket1.bind(ip::tcp::endpoint(ip::tcp::v4(), 0), error_handler);
- socket1.bind(ip::tcp::endpoint(ip::tcp::v6(), 0), error_handler);
+ socket1.bind(ip::tcp::endpoint(ip::tcp::v4(), 0), ec);
+ socket1.bind(ip::tcp::endpoint(ip::tcp::v6(), 0), ec);
socket1.connect(ip::tcp::endpoint(ip::tcp::v4(), 0));
socket1.connect(ip::tcp::endpoint(ip::tcp::v6(), 0));
- socket1.connect(ip::tcp::endpoint(ip::tcp::v4(), 0), error_handler);
- socket1.connect(ip::tcp::endpoint(ip::tcp::v6(), 0), error_handler);
+ socket1.connect(ip::tcp::endpoint(ip::tcp::v4(), 0), ec);
+ socket1.connect(ip::tcp::endpoint(ip::tcp::v6(), 0), ec);
socket1.async_connect(ip::tcp::endpoint(ip::tcp::v4(), 0),
connect_handler);
socket1.async_connect(ip::tcp::endpoint(ip::tcp::v6(), 0),
connect_handler);
socket1.set_option(socket_option);
- socket1.set_option(socket_option, error_handler);
+ socket1.set_option(socket_option, ec);
socket1.get_option(socket_option);
- socket1.get_option(socket_option, error_handler);
+ socket1.get_option(socket_option, ec);
socket1.io_control(io_control_command);
- socket1.io_control(io_control_command, error_handler);
+ socket1.io_control(io_control_command, ec);
ip::tcp::endpoint endpoint1 = socket1.local_endpoint();
- ip::tcp::endpoint endpoint2 = socket1.local_endpoint(error_handler);
+ ip::tcp::endpoint endpoint2 = socket1.local_endpoint(ec);
ip::tcp::endpoint endpoint3 = socket1.remote_endpoint();
- ip::tcp::endpoint endpoint4 = socket1.remote_endpoint(error_handler);
+ ip::tcp::endpoint endpoint4 = socket1.remote_endpoint(ec);
socket1.shutdown(socket_base::shutdown_both);
- socket1.shutdown(socket_base::shutdown_both, error_handler);
+ socket1.shutdown(socket_base::shutdown_both, ec);
// basic_stream_socket functions.
@@ -143,8 +140,8 @@
socket1.send(buffer(const_char_buffer));
socket1.send(buffer(mutable_char_buffer), in_flags);
socket1.send(buffer(const_char_buffer), in_flags);
- socket1.send(buffer(mutable_char_buffer), in_flags, error_handler);
- socket1.send(buffer(const_char_buffer), in_flags, error_handler);
+ socket1.send(buffer(mutable_char_buffer), in_flags, ec);
+ socket1.send(buffer(const_char_buffer), in_flags, ec);
socket1.async_send(buffer(mutable_char_buffer), send_handler);
socket1.async_send(buffer(const_char_buffer), send_handler);
@@ -153,7 +150,7 @@
socket1.receive(buffer(mutable_char_buffer));
socket1.receive(buffer(mutable_char_buffer), in_flags);
- socket1.receive(buffer(mutable_char_buffer), in_flags, error_handler);
+ socket1.receive(buffer(mutable_char_buffer), in_flags, ec);
socket1.async_receive(buffer(mutable_char_buffer), receive_handler);
socket1.async_receive(buffer(mutable_char_buffer), in_flags,
@@ -161,23 +158,23 @@
socket1.write_some(buffer(mutable_char_buffer));
socket1.write_some(buffer(const_char_buffer));
- socket1.write_some(buffer(mutable_char_buffer), error_handler);
- socket1.write_some(buffer(const_char_buffer), error_handler);
+ socket1.write_some(buffer(mutable_char_buffer), ec);
+ socket1.write_some(buffer(const_char_buffer), ec);
socket1.async_write_some(buffer(mutable_char_buffer), write_some_handler);
socket1.async_write_some(buffer(const_char_buffer), write_some_handler);
socket1.read_some(buffer(mutable_char_buffer));
- socket1.read_some(buffer(mutable_char_buffer), error_handler);
+ socket1.read_some(buffer(mutable_char_buffer), ec);
socket1.async_read_some(buffer(mutable_char_buffer), read_some_handler);
socket1.peek(buffer(mutable_char_buffer));
- socket1.peek(buffer(mutable_char_buffer), error_handler);
+ socket1.peek(buffer(mutable_char_buffer), ec);
std::size_t in_avail1 = socket1.in_avail();
(void)in_avail1;
- std::size_t in_avail2 = socket1.in_avail(error_handler);
+ std::size_t in_avail2 = socket1.in_avail(ec);
(void)in_avail2;
}
catch (std::exception&)
@@ -198,12 +195,12 @@
using namespace boost::asio;
-void handle_accept(const error& err)
+void handle_accept(const boost::system::error_code& err)
{
BOOST_CHECK(!err);
}
-void handle_connect(const error& err)
+void handle_connect(const boost::system::error_code& err)
{
BOOST_CHECK(!err);
}
Index: udp.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/asio/test/ip/udp.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- udp.cpp 4 Nov 2006 07:14:10 -0000 1.1
+++ udp.cpp 8 Nov 2006 05:32:17 -0000 1.2
@@ -32,19 +32,15 @@
using namespace boost::asio;
-void error_handler(const error&)
-{
-}
-
-void connect_handler(const error&)
+void connect_handler(const boost::system::error_code&)
{
}
-void send_handler(const error&, std::size_t)
+void send_handler(const boost::system::error_code&, std::size_t)
{
}
-void receive_handler(const error&, std::size_t)
+void receive_handler(const boost::system::error_code&, std::size_t)
{
}
@@ -58,6 +54,7 @@
socket_base::message_flags in_flags = 0;
socket_base::keep_alive socket_option;
socket_base::bytes_readable io_control_command;
+ boost::system::error_code ec;
// basic_datagram_socket constructors.
@@ -81,53 +78,53 @@
socket1.open(ip::udp::v4());
socket1.open(ip::udp::v6());
- socket1.open(ip::udp::v4(), error_handler);
- socket1.open(ip::udp::v6(), error_handler);
+ socket1.open(ip::udp::v4(), ec);
+ socket1.open(ip::udp::v6(), ec);
int native_socket2 = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
socket1.assign(ip::udp::v4(), native_socket2);
int native_socket3 = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
- socket1.assign(ip::udp::v4(), native_socket3, error_handler);
+ socket1.assign(ip::udp::v4(), native_socket3, ec);
socket1.close();
- socket1.close(error_handler);
+ socket1.close(ec);
ip::udp::socket::native_type native_socket4 = socket1.native();
(void)native_socket4;
socket1.cancel();
- socket1.cancel(error_handler);
+ socket1.cancel(ec);
socket1.bind(ip::udp::endpoint(ip::udp::v4(), 0));
socket1.bind(ip::udp::endpoint(ip::udp::v6(), 0));
- socket1.bind(ip::udp::endpoint(ip::udp::v4(), 0), error_handler);
- socket1.bind(ip::udp::endpoint(ip::udp::v6(), 0), error_handler);
+ socket1.bind(ip::udp::endpoint(ip::udp::v4(), 0), ec);
+ socket1.bind(ip::udp::endpoint(ip::udp::v6(), 0), ec);
socket1.connect(ip::udp::endpoint(ip::udp::v4(), 0));
socket1.connect(ip::udp::endpoint(ip::udp::v6(), 0));
- socket1.connect(ip::udp::endpoint(ip::udp::v4(), 0), error_handler);
- socket1.connect(ip::udp::endpoint(ip::udp::v6(), 0), error_handler);
+ socket1.connect(ip::udp::endpoint(ip::udp::v4(), 0), ec);
+ socket1.connect(ip::udp::endpoint(ip::udp::v6(), 0), ec);
socket1.async_connect(ip::udp::endpoint(ip::udp::v4(), 0),
connect_handler);
socket1.async_connect(ip::udp::endpoint(ip::udp::v6(), 0),
connect_handler);
socket1.set_option(socket_option);
- socket1.set_option(socket_option, error_handler);
+ socket1.set_option(socket_option, ec);
socket1.get_option(socket_option);
- socket1.get_option(socket_option, error_handler);
+ socket1.get_option(socket_option, ec);
socket1.io_control(io_control_command);
- socket1.io_control(io_control_command, error_handler);
+ socket1.io_control(io_control_command, ec);
ip::udp::endpoint endpoint1 = socket1.local_endpoint();
- ip::udp::endpoint endpoint2 = socket1.local_endpoint(error_handler);
+ ip::udp::endpoint endpoint2 = socket1.local_endpoint(ec);
ip::udp::endpoint endpoint3 = socket1.remote_endpoint();
- ip::udp::endpoint endpoint4 = socket1.remote_endpoint(error_handler);
+ ip::udp::endpoint endpoint4 = socket1.remote_endpoint(ec);
socket1.shutdown(socket_base::shutdown_both);
- socket1.shutdown(socket_base::shutdown_both, error_handler);
+ socket1.shutdown(socket_base::shutdown_both, ec);
// basic_datagram_socket functions.
@@ -135,18 +132,22 @@
socket1.send(buffer(const_char_buffer));
socket1.send(buffer(mutable_char_buffer), in_flags);
socket1.send(buffer(const_char_buffer), in_flags);
- socket1.send(buffer(mutable_char_buffer), in_flags, error_handler);
- socket1.send(buffer(const_char_buffer), in_flags, error_handler);
+ socket1.send(buffer(mutable_char_buffer), in_flags, ec);
+ socket1.send(buffer(const_char_buffer), in_flags, ec);
socket1.async_send(buffer(mutable_char_buffer), send_handler);
socket1.async_send(buffer(const_char_buffer), send_handler);
socket1.async_send(buffer(mutable_char_buffer), in_flags, send_handler);
socket1.async_send(buffer(const_char_buffer), in_flags, send_handler);
- socket1.send_to(buffer(mutable_char_buffer),
ip::udp::endpoint(ip::udp::v4(), 0));
- socket1.send_to(buffer(mutable_char_buffer),
ip::udp::endpoint(ip::udp::v6(), 0));
- socket1.send_to(buffer(const_char_buffer),
ip::udp::endpoint(ip::udp::v4(), 0));
- socket1.send_to(buffer(const_char_buffer),
ip::udp::endpoint(ip::udp::v6(), 0));
+ socket1.send_to(buffer(mutable_char_buffer),
+ ip::udp::endpoint(ip::udp::v4(), 0));
+ socket1.send_to(buffer(mutable_char_buffer),
+ ip::udp::endpoint(ip::udp::v6(), 0));
+ socket1.send_to(buffer(const_char_buffer),
+ ip::udp::endpoint(ip::udp::v4(), 0));
+ socket1.send_to(buffer(const_char_buffer),
+ ip::udp::endpoint(ip::udp::v6(), 0));
socket1.send_to(buffer(mutable_char_buffer),
ip::udp::endpoint(ip::udp::v4(), 0), in_flags);
socket1.send_to(buffer(mutable_char_buffer),
@@ -156,13 +157,13 @@
socket1.send_to(buffer(const_char_buffer),
ip::udp::endpoint(ip::udp::v6(), 0), in_flags);
socket1.send_to(buffer(mutable_char_buffer),
- ip::udp::endpoint(ip::udp::v4(), 0), in_flags, error_handler);
+ ip::udp::endpoint(ip::udp::v4(), 0), in_flags, ec);
socket1.send_to(buffer(mutable_char_buffer),
- ip::udp::endpoint(ip::udp::v6(), 0), in_flags, error_handler);
+ ip::udp::endpoint(ip::udp::v6(), 0), in_flags, ec);
socket1.send_to(buffer(const_char_buffer),
- ip::udp::endpoint(ip::udp::v4(), 0), in_flags, error_handler);
+ ip::udp::endpoint(ip::udp::v4(), 0), in_flags, ec);
socket1.send_to(buffer(const_char_buffer),
- ip::udp::endpoint(ip::udp::v6(), 0), in_flags, error_handler);
+ ip::udp::endpoint(ip::udp::v6(), 0), in_flags, ec);
socket1.async_send_to(buffer(mutable_char_buffer),
ip::udp::endpoint(ip::udp::v4(), 0), send_handler);
@@ -183,7 +184,7 @@
socket1.receive(buffer(mutable_char_buffer));
socket1.receive(buffer(mutable_char_buffer), in_flags);
- socket1.receive(buffer(mutable_char_buffer), in_flags, error_handler);
+ socket1.receive(buffer(mutable_char_buffer), in_flags, ec);
socket1.async_receive(buffer(mutable_char_buffer), receive_handler);
socket1.async_receive(buffer(mutable_char_buffer), in_flags,
@@ -192,8 +193,7 @@
ip::udp::endpoint endpoint;
socket1.receive_from(buffer(mutable_char_buffer), endpoint);
socket1.receive_from(buffer(mutable_char_buffer), endpoint, in_flags);
- socket1.receive_from(buffer(mutable_char_buffer),
- endpoint, in_flags, error_handler);
+ socket1.receive_from(buffer(mutable_char_buffer), endpoint, in_flags, ec);
socket1.async_receive_from(buffer(mutable_char_buffer),
endpoint, receive_handler);
@@ -217,15 +217,15 @@
using namespace boost::asio;
-void handle_send(size_t expected_bytes_sent, const error& err,
- size_t bytes_sent)
+void handle_send(size_t expected_bytes_sent,
+ const boost::system::error_code& err, size_t bytes_sent)
{
BOOST_CHECK(!err);
BOOST_CHECK(expected_bytes_sent == bytes_sent);
}
-void handle_recv(size_t expected_bytes_recvd, const error& err,
- size_t bytes_recvd)
+void handle_recv(size_t expected_bytes_recvd,
+ const boost::system::error_code& err, size_t bytes_recvd)
{
BOOST_CHECK(!err);
BOOST_CHECK(expected_bytes_recvd == bytes_recvd);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
