No template class anymore

Author: hamidr

includes/monitor.hpp

@@ -7,7 +7,6 @@
 
 namespace async_redis
 {
-  template<typename InputOutputHandler>
   class monitor
   {
     using async_socket    = network::async_socket;
@@ -25,19 +24,19 @@ namespace async_redis
     using parser_t     = parser::redis_response::parser;
     using watcher_cb_t = std::function<void (const string&, parser_t, EventState)>;
 
-    monitor(InputOutputHandler &event_loop)
+    monitor(event_loop::event_loop_ev &event_loop)
       : io_(event_loop)
     {}
 
-    void connect(typename async_socket::connect_handler_t handler, const std::string& ip, int port)
+    void connect(async_socket::connect_handler_t handler, const std::string& ip, int port)
     {
       if (!socket_ || !socket_->is_valid())
         socket_ = std::make_unique<tcp_socket>(io_);
 
       socket_->template async_connect<tcp_socket>(0, handler, ip, port);
     }
 
-    void connect(typename async_socket::connect_handler_t handler, const std::string& path)
+    void connect(async_socket::connect_handler_t handler, const std::string& path)
     {
       if (!socket_ || !socket_->is_valid())
         socket_ = std::make_unique<unix_socket>(io_);
@@ -277,7 +276,7 @@ namespace async_redis
     std::unordered_map<std::string, watcher_cb_t> pwatchers_;
 
     std::unique_ptr<async_socket> socket_;
-    InputOutputHandler &io_;
+    event_loop::event_loop_ev &io_;
     enum { max_data_size = 1024 };
     char data_[max_data_size];
     bool is_watching_ = false;

includes/redis_client.hpp

@@ -5,14 +5,11 @@
 #include <memory>
 
 #include "connection.hpp"
-#include "network/async_socket.hpp"
-#include "parser/redis_response.h"
 
 namespace async_redis
 {
   using std::string;
 
-  template<typename InputOutputHandler>
   class redis_client
   {
     using reply_cb_t   = connection::reply_cb_t;
@@ -22,13 +19,12 @@ namespace async_redis
     class connect_exception : std::exception {};
     using parser_t = connection::parser_t;
 
-    redis_client(InputOutputHandler &eventIO, int n = 1)
-      : ev_loop_(eventIO)
+    redis_client(event_loop::event_loop_ev &eventIO, int n = 1)
     {
       conn_pool_.reserve(n);
 
       for (int i = 0; i < conn_pool_.capacity(); ++i)
-        conn_pool_.push_back(std::make_unique<connection>(ev_loop_));
+        conn_pool_.push_back(std::make_unique<connection>(eventIO));
     }
 
     bool is_connected() const
@@ -176,6 +172,5 @@ namespace async_redis
     int con_rr_ctr_ = 0;
     int connected_called_ = 0;
     bool is_connected_ = false;
-    InputOutputHandler& ev_loop_;
   };
 }