@@ -231,7 +231,6 @@ using socket_t = int;
231
231
#include < string>
232
232
#include < sys/stat.h>
233
233
#include < thread>
234
- #include < type_traits>
235
234
#include < unordered_map>
236
235
#include < unordered_set>
237
236
#include < utility>
@@ -874,7 +873,7 @@ class Server {
874
873
875
874
template <class ErrorHandlerFunc >
876
875
Server &set_error_handler (ErrorHandlerFunc &&handler) {
877
- return set_error_handler_impl (
876
+ return set_error_handler_core (
878
877
std::forward<ErrorHandlerFunc>(handler),
879
878
std::is_convertible<ErrorHandlerFunc, HandlerWithResponse>{});
880
879
}
@@ -940,9 +939,6 @@ class Server {
940
939
size_t payload_max_length_ = CPPHTTPLIB_PAYLOAD_MAX_LENGTH;
941
940
942
941
private:
943
- Server &set_error_handler_impl (HandlerWithResponse handler, std::true_type);
944
- Server &set_error_handler_impl (Handler handler, std::false_type);
945
-
946
942
using Handlers =
947
943
std::vector<std::pair<std::unique_ptr<detail::MatcherBase>, Handler>>;
948
944
using HandlersForContentReader =
@@ -952,6 +948,9 @@ class Server {
952
948
static std::unique_ptr<detail::MatcherBase>
953
949
make_matcher (const std::string &pattern);
954
950
951
+ Server &set_error_handler_core (HandlerWithResponse handler, std::true_type);
952
+ Server &set_error_handler_core (Handler handler, std::false_type);
953
+
955
954
socket_t create_server_socket (const std::string &host, int port,
956
955
int socket_flags,
957
956
SocketOptions socket_options) const ;
@@ -5817,13 +5816,13 @@ inline Server &Server::set_file_request_handler(Handler handler) {
5817
5816
return *this ;
5818
5817
}
5819
5818
5820
- inline Server &Server::set_error_handler_impl (HandlerWithResponse handler,
5819
+ inline Server &Server::set_error_handler_core (HandlerWithResponse handler,
5821
5820
std::true_type) {
5822
5821
error_handler_ = std::move (handler);
5823
5822
return *this ;
5824
5823
}
5825
5824
5826
- inline Server &Server::set_error_handler_impl (Handler handler,
5825
+ inline Server &Server::set_error_handler_core (Handler handler,
5827
5826
std::false_type) {
5828
5827
error_handler_ = [handler](const Request &req, Response &res) {
5829
5828
handler (req, res);
0 commit comments