[svn] commit: r1972 - in /branches/trac168/src/lib/config/tests: Makefile.am fake_session.cc

BIND 10 source code commits bind10-changes at lists.isc.org
Sat May 29 01:24:34 UTC 2010


Author: jinmei
Date: Sat May 29 01:24:34 2010
New Revision: 1972

Log:
removed unnecessary ASIO definitions from fake_session, and removed dependency on libpthread

Modified:
    branches/trac168/src/lib/config/tests/Makefile.am
    branches/trac168/src/lib/config/tests/fake_session.cc

Modified: branches/trac168/src/lib/config/tests/Makefile.am
==============================================================================
--- branches/trac168/src/lib/config/tests/Makefile.am (original)
+++ branches/trac168/src/lib/config/tests/Makefile.am Sat May 29 01:24:34 2010
@@ -20,7 +20,6 @@
 run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
 run_unittests_LDADD += $(top_builddir)/src/lib/cc/data.o
 run_unittests_LDADD += libfake_session.la
-run_unittests_LDADD += -lpthread
 
 endif
 

Modified: branches/trac168/src/lib/config/tests/fake_session.cc
==============================================================================
--- branches/trac168/src/lib/config/tests/fake_session.cc (original)
+++ branches/trac168/src/lib/config/tests/fake_session.cc Sat May 29 01:24:34 2010
@@ -23,11 +23,6 @@
 #include <iostream>
 #include <sstream>
 
-#include <asio/io_service.hpp>
-#include <asio/ip/tcp.hpp>
-
-#include <boost/bind.hpp>
-#include <boost/function.hpp>
 #include <boost/foreach.hpp>
 
 #include <exceptions/exceptions.h>
@@ -38,11 +33,6 @@
 using namespace std;
 using namespace isc::cc;
 using namespace isc::data;
-
-// some of the asio names conflict with socket API system calls
-// (e.g. write(2)) so we don't import the entire asio namespace.
-using asio::io_service;
-using asio::ip::tcp;
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -141,7 +131,7 @@
 {
 }
 
-Session::Session(io_service& io_service UNUSED_PARAM)
+Session::Session(asio::io_service& io_service UNUSED_PARAM)
 {
 }
 




More information about the bind10-changes mailing list