aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2018-11-02 18:47:47 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2018-11-02 18:47:47 +0300
commit41328940bc7dc640d5777f86e048c13d6fce7f29 (patch)
treeca074e65d0fd962da5abe8b5d1999c68897edaca
parenteec5261ac983f8d23e59431cff1f4f681edbd100 (diff)
Fix 'cast between incompatible function types' GCC 8 warnings (-Wextra)
-rw-r--r--web/apache/service.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/web/apache/service.cxx b/web/apache/service.cxx
index bad98cc..e752f65 100644
--- a/web/apache/service.cxx
+++ b/web/apache/service.cxx
@@ -16,12 +16,14 @@
#include <cstring> // strlen(), strcmp()
#include <exception>
+#include <libbutl/utility.mxx> // function_cast()
#include <libbutl/optional.mxx>
#include <web/module.hxx>
#include <web/apache/log.hxx>
using namespace std;
+using namespace butl;
namespace web
{
@@ -52,7 +54,7 @@ namespace web
*d++ =
{
i.first->first.c_str (),
- reinterpret_cast<cmd_func> (parse_option),
+ function_cast<cmd_func> (parse_option),
this,
// Allow directives in both server and directory configuration
@@ -77,7 +79,7 @@ namespace web
*d++ =
{
"SetHandler",
- reinterpret_cast<cmd_func> (parse_option),
+ function_cast<cmd_func> (parse_option),
this,
RSRC_CONF | ACCESS_CONF,
RAW_ARGS,