Merge pull request #63 from robotology/fix/namespaces

src/blocktestcore/connection.cpp

@@ -8,6 +8,7 @@
 #include <chrono>
 
 using namespace std::literals::chrono_literals;
+using namespace boost::asio::ip;
 
 Connection::Connection(boost::asio::io_service& io_service): socket_(io_service)
 {
@@ -24,13 +25,13 @@ void Connection::handleRead(const boost::system::error_code& err,size_t bytes_tr
         if(bytes_transferred==0)
         {
             std::cout<<"Transferred 0"<<std::endl;
-        }  
+        }
         else
         {
             std::cout<<readBuffer_<<std::endl;;
-        }        
+        }
         start();
-    }    
+    }
 }
 
 tcp::socket& Connection::socket()
@@ -45,5 +46,5 @@ void Connection::start()
                     boost::bind(&Connection::handleRead,
                     shared_from_this(),
                     boost::asio::placeholders::error,
-                    boost::asio::placeholders::bytes_transferred));                
+                    boost::asio::placeholders::bytes_transferred));
 }

src/blocktestcore/connection.h

@@ -14,8 +14,6 @@
 #include <boost/asio.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
-using boost::asio::ip::tcp;
-
 class Connection : public boost::enable_shared_from_this<Connection>
 {
 public:
@@ -25,18 +23,18 @@ class Connection : public boost::enable_shared_from_this<Connection>
     return pointer(new Connection(io_service));
 }
 
-  tcp::socket& socket();
+  boost::asio::ip::tcp::socket& socket();
 
   void start();
 
 private:
   Connection(boost::asio::io_service& io_service);
 
-  void handleWrite(const boost::system::error_code& err,size_t bytes_transferred);   
-  void handleRead(const boost::system::error_code& err,size_t bytes_transferred);   
-  
+  void handleWrite(const boost::system::error_code& err,size_t bytes_transferred);
+  void handleRead(const boost::system::error_code& err,size_t bytes_transferred);
+
   static const int size_{1024};
   char readBuffer_[size_];
   boost::asio::streambuf response_;
-  tcp::socket socket_;
+  boost::asio::ip::tcp::socket socket_;
 };

src/blocktestcore/server.cpp

@@ -6,13 +6,14 @@
 #include <chrono>
 
 using namespace std::literals::chrono_literals;
+using namespace boost::asio::ip;
 
 Server::Server(boost::asio::io_service& io):io_(io),acceptor_(io, tcp::endpoint(tcp::v4(), 9876))
-{ 
+{
 }
 
 void Server::init()
-{ 
+{
     startAccept();
 }
 

src/blocktestcore/server.h

@@ -13,9 +13,6 @@
 #pragma once
 #include <boost/asio.hpp>
 #include "connection.h"
-
-using boost::asio::ip::tcp;
-
 class Server
 {
     public:
@@ -24,9 +21,9 @@ class Server
     private:
         const unsigned int port_{9876};
         boost::asio::io_service& io_;
-        tcp::acceptor acceptor_;
+        boost::asio::ip::tcp::acceptor acceptor_;
         Connection::pointer newConnection_;
-        
+
         void startAccept();
         void handleAccept(Connection::pointer newConnection,const boost::system::error_code& error);
 };