From 366bae00016bfbfdd354ab010555c2927505b2b2 Mon Sep 17 00:00:00 2001 From: Dennis Brentjes Date: Thu, 13 Oct 2016 14:35:32 +0200 Subject: Second big network rewrite. This time without the ugly SFINAE hack to restrict sending and receiving on Senders and Receivers respectively. Replaced this hack with private inheritance and using declerations. Also renamed receive to async_receive to better reflect the behaviour. --- client/CMakeLists.txt | 1 + client/cmixclient.hpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'client') diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 489a136..68a37da 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -25,4 +25,5 @@ target_link_libraries(client PRIVATE cmix-bignum PRIVATE cmix-network PRIVATE cmix-protobuf + PRIVATE cmix-common ) diff --git a/client/cmixclient.hpp b/client/cmixclient.hpp index 056e2b3..71be7c9 100644 --- a/client/cmixclient.hpp +++ b/client/cmixclient.hpp @@ -1,6 +1,6 @@ #pragma once -#include "protobufclient.hpp" +#include "senderreceiver.hpp" #include "api.h" #include "logging.hpp" @@ -21,7 +21,7 @@ class CMixClient { boost::asio::io_service io_service; std::vector network_details; - std::vector> network_connections; + std::vector network_connections; Api api; KeyPair keypair; -- cgit v1.2.3-70-g09d2