summaryrefslogtreecommitdiff
path: root/net/nginx-util/src/nginx-util.cpp
diff options
context:
space:
mode:
authorPeter Stadler <peter.stadler@student.uibk.ac.at>2020-05-26 16:21:10 +0200
committerPeter Stadler <peter.stadler@student.uibk.ac.at>2020-05-26 18:36:03 +0200
commit2d359a45566ea02792d3f63d7fe4ec1bdb1de2ae (patch)
treedfafc29439d2569fef9a6c5771ace2c76db19659 /net/nginx-util/src/nginx-util.cpp
parent5e6b871e9ee1c10337d02f6049bfe780f381e25a (diff)
nginx-util: fix issues and cleanup
* fix regex capture (to conform std) * fix issues for Clang/libcxx (warnings/includes) * fix CONFLICTS in the Makefile * use /bin/sh in host scripts and shellcheck them * add callback for setting arguments in ubus::call Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
Diffstat (limited to 'net/nginx-util/src/nginx-util.cpp')
-rw-r--r--net/nginx-util/src/nginx-util.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/nginx-util/src/nginx-util.cpp b/net/nginx-util/src/nginx-util.cpp
index 02aa7013a..b0a724da6 100644
--- a/net/nginx-util/src/nginx-util.cpp
+++ b/net/nginx-util/src/nginx-util.cpp
@@ -1,3 +1,5 @@
+#include <iostream>
+
#include "nginx-util.hpp"
#ifndef NO_SSL
@@ -121,7 +123,7 @@ void get_env()
auto main(int argc, char * argv[]) -> int
{
// TODO(pst): use std::span when available:
- auto args = std::basic_string_view{argv, static_cast<size_t>(argc)};
+ auto args = std::basic_string_view<char *>{argv, static_cast<size_t>(argc)};
auto cmds = std::array{
std::array<std::string_view, 2>{"init_lan", ""},