Update of /cvsroot/boost/boost/libs/asio/example/timeouts
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25337/example/timeouts
Modified Files:
accept_timeout.cpp connect_timeout.cpp
datagram_receive_timeout.cpp stream_receive_timeout.cpp
Log Message:
Try to fix Borland C++ compile errors.
Index: accept_timeout.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/asio/example/timeouts/accept_timeout.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- accept_timeout.cpp 20 Feb 2007 13:18:37 -0000 1.5
+++ accept_timeout.cpp 20 May 2007 03:50:17 -0000 1.6
@@ -14,6 +14,7 @@
#include <iostream>
using namespace boost::asio;
+using boost::asio::ip::tcp;
class accept_handler
{
@@ -21,7 +22,7 @@
accept_handler(io_service& ios)
: io_service_(ios),
timer_(ios),
- acceptor_(ios, ip::tcp::endpoint(ip::tcp::v4(), 32123)),
+ acceptor_(ios, tcp::endpoint(tcp::v4(), 32123)),
socket_(ios)
{
acceptor_.async_accept(socket_,
@@ -52,8 +53,8 @@
private:
io_service& io_service_;
deadline_timer timer_;
- ip::tcp::acceptor acceptor_;
- ip::tcp::socket socket_;
+ tcp::acceptor acceptor_;
+ tcp::socket socket_;
};
int main()
Index: connect_timeout.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/asio/example/timeouts/connect_timeout.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- connect_timeout.cpp 20 Feb 2007 13:18:37 -0000 1.5
+++ connect_timeout.cpp 20 May 2007 03:50:19 -0000 1.6
@@ -14,6 +14,7 @@
#include <iostream>
using namespace boost::asio;
+using boost::asio::ip::tcp;
class connect_handler
{
@@ -24,7 +25,7 @@
socket_(ios)
{
socket_.async_connect(
- ip::tcp::endpoint(ip::address_v4::loopback(), 32123),
+ tcp::endpoint(boost::asio::ip::address_v4::loopback(), 32123),
boost::bind(&connect_handler::handle_connect, this,
boost::asio::placeholders::error));
@@ -52,7 +53,7 @@
private:
io_service& io_service_;
deadline_timer timer_;
- ip::tcp::socket socket_;
+ tcp::socket socket_;
};
int main()
@@ -60,7 +61,7 @@
try
{
io_service ios;
- ip::tcp::acceptor a(ios, ip::tcp::endpoint(ip::tcp::v4(), 32123), 1);
+ tcp::acceptor a(ios, tcp::endpoint(tcp::v4(), 32123), 1);
// Make lots of connections so that at least some of them will block.
connect_handler ch1(ios);
Index: datagram_receive_timeout.cpp
===================================================================
RCS file:
/cvsroot/boost/boost/libs/asio/example/timeouts/datagram_receive_timeout.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- datagram_receive_timeout.cpp 20 Feb 2007 13:18:37 -0000 1.5
+++ datagram_receive_timeout.cpp 20 May 2007 03:50:22 -0000 1.6
@@ -14,6 +14,7 @@
#include <iostream>
using namespace boost::asio;
+using boost::asio::ip::udp;
class datagram_handler
{
@@ -21,7 +22,7 @@
datagram_handler(io_service& ios)
: io_service_(ios),
timer_(ios),
- socket_(ios, ip::udp::endpoint(ip::udp::v4(), 32124))
+ socket_(ios, udp::endpoint(udp::v4(), 32124))
{
socket_.async_receive_from(
boost::asio::buffer(data_, max_length), sender_endpoint_,
@@ -53,8 +54,8 @@
private:
io_service& io_service_;
deadline_timer timer_;
- ip::udp::socket socket_;
- ip::udp::endpoint sender_endpoint_;
+ udp::socket socket_;
+ udp::endpoint sender_endpoint_;
enum { max_length = 512 };
char data_[max_length];
};
Index: stream_receive_timeout.cpp
===================================================================
RCS file:
/cvsroot/boost/boost/libs/asio/example/timeouts/stream_receive_timeout.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- stream_receive_timeout.cpp 20 Feb 2007 13:18:37 -0000 1.5
+++ stream_receive_timeout.cpp 20 May 2007 03:50:22 -0000 1.6
@@ -14,6 +14,7 @@
#include <iostream>
using namespace boost::asio;
+using boost::asio::ip::tcp;
class stream_handler
{
@@ -21,7 +22,7 @@
stream_handler(io_service& ios)
: io_service_(ios),
timer_(ios),
- acceptor_(ios, ip::tcp::endpoint(ip::tcp::v4(), 32123)),
+ acceptor_(ios, tcp::endpoint(tcp::v4(), 32123)),
socket_(ios)
{
acceptor_.async_accept(socket_,
@@ -67,8 +68,8 @@
private:
io_service& io_service_;
deadline_timer timer_;
- ip::tcp::acceptor acceptor_;
- ip::tcp::socket socket_;
+ tcp::acceptor acceptor_;
+ tcp::socket socket_;
char buf_[1024];
};
@@ -85,8 +86,9 @@
stream_handler sh(ios);
- ip::tcp::socket s(ios);
- s.async_connect(ip::tcp::endpoint(ip::address_v4::loopback(), 32123),
+ tcp::socket s(ios);
+ s.async_connect(
+ tcp::endpoint(boost::asio::ip::address_v4::loopback(), 32123),
boost::bind(connect_handler));
ios.run();
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
