Merge in updates for sasl.

[awesomized/libmemcached] / libtest / server.h

diff --git a/libtest/server.h b/libtest/server.h
index b4a48446c538f6e459fb72a17ac3edbfd741b9d9..123d1c3255f6d85af7b9b4ee2b26ef35c3b55099 100644 (file)
--- a/libtest/server.h
+++ b/libtest/server.h
@@ -185,82 +185,6 @@ private:
 
 std::ostream& operator<<(std::ostream& output, const libtest::Server &arg);
 
-class server_startup_st
-{
-private:
-  std::string server_list;
-  bool _socket;
-  bool _sasl;
-  std::string _username;
-  std::string _password;
-
-public:
-
-  uint8_t udp;
-  std::vector<Server *> servers;
-
-  server_startup_st() :
-    _socket(false),
-    _sasl(false),
-    udp(0)
-  { }
-
-  bool start_socket_server(const std::string& server_type, const in_port_t try_port, int argc, const char *argv[]);
-
-  std::string option_string() const;
-
-  size_t count() const
-  {
-    return servers.size();
-  }
-
-  const std::string& password() const
-  {
-    return _password;
-  }
-
-  const std::string& username() const
-  {
-    return _username;
-  }
-
-
-  bool is_debug() const;
-  bool is_helgrind() const;
-  bool is_valgrind() const;
-
-  bool socket()
-  {
-    return _socket;
-  }
-
-  bool sasl()
-  {
-    return _sasl;
-  }
-
-  void set_socket()
-  {
-    _socket= true;
-  }
-
-  void set_sasl(const std::string& username_arg, const std::string& password_arg)
-  {
-    _sasl= true;
-    _username= username_arg;
-    _password= password_arg;
-  }
-
-
-  void shutdown(bool remove= false);
-  void push_server(Server *);
-  Server *pop_server();
-
-  ~server_startup_st();
-};
-
-bool server_startup(server_startup_st&, const std::string&, in_port_t try_port, int argc, const char *argv[]);
-
 } // namespace libtest