Update of /cvsroot/boost/boost/libs/asio/test/ssl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17073/libs/asio/test/ssl
Modified Files:
Jamfile stream.cpp
Log Message:
Change error handling to match TR2 proposal.
Index: Jamfile
===================================================================
RCS file: /cvsroot/boost/boost/libs/asio/test/ssl/Jamfile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Jamfile 4 Nov 2006 07:14:10 -0000 1.3
+++ Jamfile 8 Nov 2006 05:32:17 -0000 1.4
@@ -25,6 +25,7 @@
template unit_test
: <lib>@boost/libs/thread/build/boost_thread
+ <lib>@boost/libs/system/build/boost_system
: <include>../../../..
<define>BOOST_ALL_NO_LIB=1
<threading>multi
Index: stream.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/asio/test/ssl/stream.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- stream.cpp 4 Nov 2006 07:14:10 -0000 1.1
+++ stream.cpp 8 Nov 2006 05:32:17 -0000 1.2
@@ -31,23 +31,19 @@
using namespace boost::asio;
-void error_handler(const error&)
-{
-}
-
-void handshake_handler(const error&)
+void handshake_handler(const boost::system::error_code&)
{
}
-void shutdown_handler(const error&)
+void shutdown_handler(const boost::system::error_code&)
{
}
-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)
{
}
@@ -59,6 +55,7 @@
char mutable_char_buffer[128] = "";
const char const_char_buffer[128] = "";
boost::asio::ssl::context context(ios, boost::asio::ssl::context::sslv23);
+ boost::system::error_code ec;
// ssl::stream constructors.
@@ -79,36 +76,36 @@
stream1.handshake(ssl::stream_base::client);
stream1.handshake(ssl::stream_base::server);
- stream1.handshake(ssl::stream_base::client, error_handler);
- stream1.handshake(ssl::stream_base::server, error_handler);
+ stream1.handshake(ssl::stream_base::client, ec);
+ stream1.handshake(ssl::stream_base::server, ec);
stream1.async_handshake(ssl::stream_base::client, handshake_handler);
stream1.async_handshake(ssl::stream_base::server, handshake_handler);
stream1.shutdown();
- stream1.shutdown(error_handler);
+ stream1.shutdown(ec);
stream1.async_shutdown(shutdown_handler);
stream1.write_some(buffer(mutable_char_buffer));
stream1.write_some(buffer(const_char_buffer));
- stream1.write_some(buffer(mutable_char_buffer), error_handler);
- stream1.write_some(buffer(const_char_buffer), error_handler);
+ stream1.write_some(buffer(mutable_char_buffer), ec);
+ stream1.write_some(buffer(const_char_buffer), ec);
stream1.async_write_some(buffer(mutable_char_buffer), write_some_handler);
stream1.async_write_some(buffer(const_char_buffer), write_some_handler);
stream1.read_some(buffer(mutable_char_buffer));
- stream1.read_some(buffer(mutable_char_buffer), error_handler);
+ stream1.read_some(buffer(mutable_char_buffer), ec);
stream1.async_read_some(buffer(mutable_char_buffer), read_some_handler);
stream1.peek(buffer(mutable_char_buffer));
- stream1.peek(buffer(mutable_char_buffer), error_handler);
+ stream1.peek(buffer(mutable_char_buffer), ec);
std::size_t in_avail1 = stream1.in_avail();
(void)in_avail1;
- std::size_t in_avail2 = stream1.in_avail(error_handler);
+ std::size_t in_avail2 = stream1.in_avail(ec);
(void)in_avail2;
}
catch (std::exception&)
-------------------------------------------------------------------------
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
