diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-07 04:48:35 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-07 04:48:35 +0000 |
commit | 207df6fc406e81bfeebdff7f404bd242ff3f099f (patch) | |
tree | a1a796b056909dd0a04ffec163db9363a8757808 /src/shlex.resolver.hh | |
parent | Releasing progress-linux version 0.11.2-1~progress7.99u1. (diff) | |
download | lnav-207df6fc406e81bfeebdff7f404bd242ff3f099f.tar.xz lnav-207df6fc406e81bfeebdff7f404bd242ff3f099f.zip |
Merging upstream version 0.12.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | src/shlex.resolver.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shlex.resolver.hh b/src/shlex.resolver.hh index 404d142..50afa24 100644 --- a/src/shlex.resolver.hh +++ b/src/shlex.resolver.hh @@ -37,10 +37,10 @@ #include <vector> #include "base/intern_string.hh" +#include "base/types.hh" #include "fmt/format.h" #include "mapbox/variant.hpp" -struct null_value_t {}; using scoped_value_t = mapbox::util:: variant<std::string, string_fragment, int64_t, double, null_value_t>; @@ -65,7 +65,7 @@ struct formatter<scoped_value_t> : formatter<std::string> { class scoped_resolver { public: scoped_resolver( - std::initializer_list<std::map<std::string, scoped_value_t>*> l) + std::initializer_list<const std::map<std::string, scoped_value_t>*> l) { this->sr_stack.insert(this->sr_stack.end(), l.begin(), l.end()); } |