Remove custom version of memcached (no longer needed).

[awesomized/libmemcached] / libtest / server.cc

diff --git a/libtest/server.cc b/libtest/server.cc
index 6542fd3fc6c474798e5a122df6dbd4df48d79128..b128788a1a32b801e8562b0907cded152522a4c8 100644 (file)
--- a/libtest/server.cc
+++ b/libtest/server.cc
@@ -327,9 +327,9 @@ void Server::add_option(const std::string& arg)
   _options.push_back(std::make_pair(arg, std::string()));
 }
 
-void Server::add_option(const std::string& name, const std::string& value)
+void Server::add_option(const std::string& name_, const std::string& value)
 {
-  _options.push_back(std::make_pair(name, value));
+  _options.push_back(std::make_pair(name_, value));
 }
 
 bool Server::set_socket_file()