jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed deprecated functions

Browse source
This commit is contained in:
eidheim 2017-07-03 14:31:22 +02:00
commit 80ab651fca
3 changed files with 0 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

7
server_http.hpp
View file

@ -508,13 +508,6 @@ namespace SimpleWeb {
template <> template <>
class Server<HTTP> : public ServerBase<HTTP> { class Server<HTTP> : public ServerBase<HTTP> {
public: 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) {} Server() : ServerBase<HTTP>::ServerBase(80) {}
protected: protected:

9
server_https.hpp
View file

@ -21,15 +21,6 @@ namespace SimpleWeb {
bool set_session_id_context = false; bool set_session_id_context = false;
public: 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()) 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) { : ServerBase<HTTPS>::ServerBase(443), context(asio::ssl::context::tlsv12) {
context.use_certificate_chain_file(cert_file); context.use_certificate_chain_file(cert_file);

16
utility.hpp
View file

@ -6,17 +6,6 @@
#include <string> #include <string>
#include <unordered_map> #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 { namespace SimpleWeb {
#ifndef CASE_INSENSITIVE_EQUAL_AND_HASH #ifndef CASE_INSENSITIVE_EQUAL_AND_HASH
#define CASE_INSENSITIVE_EQUAL_AND_HASH #define CASE_INSENSITIVE_EQUAL_AND_HASH
@ -145,11 +134,6 @@ namespace SimpleWeb {
return result; 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 } // namespace SimpleWeb
#endif // SIMPLE_WEB_SERVER_UTILITY_HPP #endif // SIMPLE_WEB_SERVER_UTILITY_HPP