From 80ab651fca1d6f00290ff06440ff1185ea703d22 Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Mon, 3 Jul 2017 14:31:22 +0200
Subject: [PATCH] Removed deprecated functions

---
 server_http.hpp  |  7 -------
 server_https.hpp |  9 ---------
 utility.hpp      | 16 ----------------
 3 files changed, 32 deletions(-)

diff --git a/server_http.hpp b/server_http.hpp
index b2e4216..f87c0c8 100644
--- a/server_http.hpp
+++ b/server_http.hpp
@@ -508,13 +508,6 @@ namespace SimpleWeb {
   template <>
   class Server<HTTP> : public ServerBase<HTTP> {
   public:
-    DEPRECATED Server(unsigned short port, size_t thread_pool_size = 1, long timeout_request = 5, long timeout_content = 300) : Server() {
-      config.port = port;
-      config.thread_pool_size = thread_pool_size;
-      config.timeout_request = timeout_request;
-      config.timeout_content = timeout_content;
-    }
-
     Server() : ServerBase<HTTP>::ServerBase(80) {}
 
   protected:
diff --git a/server_https.hpp b/server_https.hpp
index 64e342c..18c44ba 100644
--- a/server_https.hpp
+++ b/server_https.hpp
@@ -21,15 +21,6 @@ namespace SimpleWeb {
     bool set_session_id_context = false;
 
   public:
-    DEPRECATED Server(unsigned short port, size_t thread_pool_size, const std::string &cert_file, const std::string &private_key_file,
-                      long timeout_request = 5, long timeout_content = 300, const std::string &verify_file = std::string())
-        : Server(cert_file, private_key_file, verify_file) {
-      config.port = port;
-      config.thread_pool_size = thread_pool_size;
-      config.timeout_request = timeout_request;
-      config.timeout_content = timeout_content;
-    }
-
     Server(const std::string &cert_file, const std::string &private_key_file, const std::string &verify_file = std::string())
         : ServerBase<HTTPS>::ServerBase(443), context(asio::ssl::context::tlsv12) {
       context.use_certificate_chain_file(cert_file);
diff --git a/utility.hpp b/utility.hpp
index bd5c63b..f63d8e0 100644
--- a/utility.hpp
+++ b/utility.hpp
@@ -6,17 +6,6 @@
 #include <string>
 #include <unordered_map>
 
-// TODO when switching to c++14, use [[deprecated]] instead
-#ifndef DEPRECATED
-#ifdef __GNUC__
-#define DEPRECATED __attribute__((deprecated))
-#elif defined(_MSC_VER)
-#define DEPRECATED __declspec(deprecated)
-#else
-#define DEPRECATED
-#endif
-#endif
-
 namespace SimpleWeb {
 #ifndef CASE_INSENSITIVE_EQUAL_AND_HASH
 #define CASE_INSENSITIVE_EQUAL_AND_HASH
@@ -145,11 +134,6 @@ namespace SimpleWeb {
       return result;
     }
   };
-
-  /// Returns query keys with percent-decoded values.
-  DEPRECATED inline CaseInsensitiveMultimap parse_query_string(const std::string &query_string) {
-    return QueryString::parse(query_string);
-  }
 } // namespace SimpleWeb
 
 #endif // SIMPLE_WEB_SERVER_UTILITY_HPP