lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-04-19 00:24:02 +03:00
Code

Code cleanup

Browse Source
This commit is contained in:
yhirose 2024-04-11 22:26:30 -04:00
parent 34d392cf3d
commit 07288888ad
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
httplib.h
View File

@ -231,7 +231,6 @@ using socket_t = int;
#include <string> #include <string>
#include <sys/stat.h> #include <sys/stat.h>
#include <thread> #include <thread>
#include <type_traits>
#include <unordered_map> #include <unordered_map>
#include <unordered_set> #include <unordered_set>
#include <utility> #include <utility>
@ -874,7 +873,7 @@ public:
template <class ErrorHandlerFunc> template <class ErrorHandlerFunc>
Server &set_error_handler(ErrorHandlerFunc &&handler) { Server &set_error_handler(ErrorHandlerFunc &&handler) {
return set_error_handler_impl( return set_error_handler_core(
std::forward<ErrorHandlerFunc>(handler), std::forward<ErrorHandlerFunc>(handler),
std::is_convertible<ErrorHandlerFunc, HandlerWithResponse>{}); std::is_convertible<ErrorHandlerFunc, HandlerWithResponse>{});
} }
@ -940,9 +939,6 @@ protected:
size_t payload_max_length_ = CPPHTTPLIB_PAYLOAD_MAX_LENGTH; size_t payload_max_length_ = CPPHTTPLIB_PAYLOAD_MAX_LENGTH;
private: private:
Server &set_error_handler_impl(HandlerWithResponse handler, std::true_type);
Server &set_error_handler_impl(Handler handler, std::false_type);
using Handlers = using Handlers =
std::vector<std::pair<std::unique_ptr<detail::MatcherBase>, Handler>>; std::vector<std::pair<std::unique_ptr<detail::MatcherBase>, Handler>>;
using HandlersForContentReader = using HandlersForContentReader =
@ -952,6 +948,9 @@ private:
static std::unique_ptr<detail::MatcherBase> static std::unique_ptr<detail::MatcherBase>
make_matcher(const std::string &pattern); make_matcher(const std::string &pattern);
Server &set_error_handler_core(HandlerWithResponse handler, std::true_type);
Server &set_error_handler_core(Handler handler, std::false_type);
socket_t create_server_socket(const std::string &host, int port, socket_t create_server_socket(const std::string &host, int port,
int socket_flags, int socket_flags,
SocketOptions socket_options) const; SocketOptions socket_options) const;
@ -5817,13 +5816,13 @@ inline Server &Server::set_file_request_handler(Handler handler) {
return *this; return *this;
} }
inline Server &Server::set_error_handler_impl(HandlerWithResponse handler, inline Server &Server::set_error_handler_core(HandlerWithResponse handler,
std::true_type) { std::true_type) {
error_handler_ = std::move(handler); error_handler_ = std::move(handler);
return *this; return *this;
} }
inline Server &Server::set_error_handler_impl(Handler handler, inline Server &Server::set_error_handler_core(Handler handler,
std::false_type) { std::false_type) {
error_handler_ = [handler](const Request &req, Response &res) { error_handler_ = [handler](const Request &req, Response &res) {
handler(req, res); handler(req, res);