Use libevpp from a separate repository

Author: hamidr

CMakeLists.txt

@@ -30,7 +30,7 @@ link_directories(/usr/local/lib)
 
 add_subdirectory(libs/libevpp/)
 
-include_directories(libs/libevpp/includes/)
+include_directories(libs/libevpp/includes)
 
 
 add_library(parser
@@ -54,7 +54,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_EXE_LINKER_FLAGS "-s")  ## Strip binary
 endif()
 
-target_link_libraries(async_redis network)
+target_link_libraries(async_redis network parser)
 
 add_executable (a2.out test/main.cpp)
 target_link_libraries(a2.out async_redis)

examples/tcp_server.hpp

@@ -8,13 +8,13 @@
 #include <unordered_map>
 
 namespace async_redis {
-namespace tcp_server {
+namespace examples {
 
   class tcp_server
   {
   public:
-    using tcp_socket   = async_redis::network::tcp_socket;
-    using async_socket   = async_redis::network::async_socket;
+    using tcp_socket   = libevpp::network::tcp_socket;
+    using async_socket  = libevpp::network::async_socket;
 
     tcp_server(event_loop::event_loop_ev &event_loop)
       : loop_(event_loop), listener_(event_loop) {

includes/connection.hpp

@@ -9,6 +9,8 @@
 #include <libevpp/event_loop/event_loop_ev.h>
 #include <libevpp/network/async_socket.hpp>
 
+using namespace libevpp;
+
 namespace async_redis
 {
   class connection

includes/monitor.hpp

@@ -1,13 +1,14 @@
 #pragma once
 
-#include <network/async_socket.hpp>
+#include <libevpp/network/async_socket.hpp>
 #include <parser/base_resp_parser.h>
 
 #include <unordered_map>
 #include <list>
 #include <string>
 
 using std::string;
+using namespace libevpp;
 
 namespace async_redis
 {

includes/sentinel.hpp

@@ -1,16 +1,17 @@
 #pragma once
-#include <network/async_socket.hpp>
+#include <libevpp/network/async_socket.hpp>
 #include <parser/base_resp_parser.h>
 
 #include <monitor.hpp>
 #include <functional>
 #include <connection.hpp>
-// #include <memory>
+
+using namespace libevpp;
 
 namespace async_redis {
   class sentinel
   {
-    using socket_t     = ::async_redis::network::async_socket;
+    using socket_t     = libevpp::network::async_socket;
     using connect_cb_t = socket_t::connect_handler_t;
 
   public:

libs/libevpp

@@ -6,8 +6,8 @@
 #include <tuple>
 
 #include <parser/base_resp_parser.h>
-#include <network/tcp_socket.hpp>
-#include <network/unix_socket.hpp>
+#include <libevpp/network/tcp_socket.hpp>
+#include <libevpp/network/unix_socket.hpp>
 
 
 namespace async_redis

src/connection.cpp

@@ -2,8 +2,8 @@
 
 #include <parser/array_parser.h>
 #include <cassert>
-#include "../includes/network/tcp_socket.hpp"
-#include "../includes/network/unix_socket.hpp"
+#include <libevpp/network/tcp_socket.hpp>
+#include <libevpp/network/unix_socket.hpp>
 
 namespace async_redis
 {

src/monitor.cpp

@@ -1,15 +1,15 @@
-#include <event_loop/event_loop_ev.h>
+#include <libevpp/event_loop/event_loop_ev.h>
 
 #include <redis_client.hpp>
 #include <parser/base_resp_parser.h>
-#include <network/tcp_socket.hpp>
-#include <network/unix_socket.hpp>
+#include <libevpp/network/tcp_socket.hpp>
+#include <libevpp/network/unix_socket.hpp>
 #include <monitor.hpp>
 #include <sentinel.hpp>
 #include "../examples/tcp_server.hpp"
 
 
-typedef async_redis::event_loop::event_loop_ev event_loop_ev;
+typedef libevpp::event_loop::event_loop_ev event_loop_ev;
 
 struct monitor_test
 {