From e583063ab55a064c4aea781b48407df3684dbaaf Mon Sep 17 00:00:00 2001 From: Gaetano Checinski Date: Wed, 10 Oct 2018 17:37:08 +0100 Subject: [PATCH] fix: makes serveral header definitions static to support static library builds --- .../mapnik/json/unicode_string_grammar_x3_def.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/mapnik/json/unicode_string_grammar_x3_def.hpp b/include/mapnik/json/unicode_string_grammar_x3_def.hpp index 7a989f026..8f7d0e765 100644 --- a/include/mapnik/json/unicode_string_grammar_x3_def.hpp +++ b/include/mapnik/json/unicode_string_grammar_x3_def.hpp @@ -41,7 +41,7 @@ auto append = [](auto const& ctx) namespace detail { -void push_utf8_impl(std::string & str, uchar code_point) +static void push_utf8_impl(std::string & str, uchar code_point) { using insert_iterator = std::back_insert_iterator; insert_iterator iter(str); @@ -117,25 +117,25 @@ x3::rule const escaped("Escaped Character"); x3::rule const escaped_unicode("Escaped Unicode code point(s)"); x3::rule> const utf16_string("UTF16 encoded string"); -auto unicode_string_def = double_quoted +static auto unicode_string_def = double_quoted ; -auto utf16_string_def = lit('u') > hex4 > *(lit("\\u") > hex4) +static auto utf16_string_def = lit('u') > hex4 > *(lit("\\u") > hex4) ; -auto escaped_unicode_def = +static auto escaped_unicode_def = (lit('x') > hex2[push_char]) | utf16_string[push_utf16] | (lit('U') > hex8[push_utf8]) ; -auto const escaped_def = lit('\\') > +static auto const escaped_def = lit('\\') > (escaped_unicode[append] | char_("0abtnvfre\"/\\N_LP \t")[push_esc] | eol) // continue to next line ; -auto const double_quoted_def = lit('"') > no_skip[*(escaped[append] | (~char_('"'))[append])] > lit('"'); +static auto const double_quoted_def = lit('"') > no_skip[*(escaped[append] | (~char_('"'))[append])] > lit('"'); #pragma GCC diagnostic push #include