fix

Author: yph025869

include/cppredis/cpp_redis_list.hpp

@@ -19,7 +19,7 @@ namespace cpp_redis {
 		{
 			check_args();
 
-			std::string msg = request_->req_n_key_value(request_->get_cmd(cpp_redis::rpush),
+			std::string msg = request_->req_n_key(request_->get_cmd(cpp_redis::rpush),
 				std::forward<std::string>(key), std::forward<std::string>(value));
 			socket_->send_msg(std::move(msg));
 
@@ -38,7 +38,7 @@ namespace cpp_redis {
 		{
 			check_args();
 
-			std::string msg = request_->req_n_key_value(request_->get_cmd(cpp_redis::rpushx),
+			std::string msg = request_->req_n_key(request_->get_cmd(cpp_redis::rpushx),
 				std::forward<std::string>(key), std::forward<std::string>(value));
 			socket_->send_msg(std::move(msg));
 
@@ -57,7 +57,7 @@ namespace cpp_redis {
 		{
 			check_args();
 
-			std::string msg = request_->req_n_key_value(request_->get_cmd(cpp_redis::lpush),
+			std::string msg = request_->req_n_key(request_->get_cmd(cpp_redis::lpush),
 				std::forward<std::string>(key), std::forward<std::string>(value));
 			socket_->send_msg(std::move(msg));
 
@@ -76,7 +76,7 @@ namespace cpp_redis {
 		{
 			check_args();
 
-			std::string msg = request_->req_n_key_value(request_->get_cmd(cpp_redis::lpushx), 
+			std::string msg = request_->req_n_key(request_->get_cmd(cpp_redis::lpushx), 
 				std::forward<std::string>(key), std::forward<std::string>(value));
 			socket_->send_msg(std::move(msg));
 

include/cppredis/cpp_redis_request.hpp

@@ -319,34 +319,6 @@ namespace cpp_redis {
 			return build_respone(std::move(command), std::move(cmds));
 		}
 
-		template<typename...Args>
-		std::string req_n_key_value(std::string&& command, Args&&...key_value)
-		{
-			auto tuple = std::make_tuple<Args...>(std::forward<Args>(key_value)...);
-			PAIRS pairs;
-
-			int count = 0;
-			PAIR pair;
-			cpp_redis::unit::for_each_tuple_front(tuple, [this, &pairs, &count, &pair](std::string str, const int& index) {
-				if (count < 2) {
-					if (count == 0) {
-						pair.first = std::move(str);
-					}
-					else
-					{
-						pair.second = std::move(str);
-						pairs.push_back(std::move(pair));
-						count = 0;
-						return;
-					}
-				}
-
-				++count;
-				});
-
-			return build_respone(std::move(command), std::move(pairs));
-		}
-
 		std::string req_n_keys(std::string&& command, KEYS&& keys)
 		{
 			return build_respone(std::move(command), std::forward<KEYS>(keys));

include/cppredis/cpp_redis_string.hpp

@@ -46,7 +46,8 @@ namespace cpp_redis {
 
 		virtual bool set(std::string&& key, std::string&& value)
 		{
-			std::string msg = request_->req_n_key_value(request_->get_cmd(redis_cmd::set), std::forward<std::string>(key), std::forward<std::string>(value));
+			std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::set),
+				std::forward<std::string>(key), std::forward<std::string>(value));
 			socket_->send_msg(std::move(msg));
 
 			const auto res = socket_->get_responese();
@@ -260,7 +261,8 @@ namespace cpp_redis {
 		{
 			check_args();
 
-			std::string msg = request_->req_n_key_value(request_->get_cmd(redis_cmd::get_set), std::forward<std::string>(key), std::forward <std::string>(value));
+			std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::get_set), 
+				std::forward<std::string>(key), std::forward <std::string>(value));
 			socket_->send_msg(std::move(msg));
 
 			const auto res = socket_->get_responese();