diff --git a/include/mapnik/csv/csv_grammar_x3_def.hpp b/include/mapnik/csv/csv_grammar_x3_def.hpp index 2fc1f021e..8b0f4adbe 100644 --- a/include/mapnik/csv/csv_grammar_x3_def.hpp +++ b/include/mapnik/csv/csv_grammar_x3_def.hpp @@ -39,9 +39,9 @@ using standard::char_; using x3::lexeme; using x3::lit; -struct unesc_char_ : x3::symbols +struct unesc_char_csv_ : x3::symbols { - unesc_char_() + unesc_char_csv_() { add("\\a", '\a') // ("\\b", '\b') // @@ -56,7 +56,7 @@ struct unesc_char_ : x3::symbols ("\"\"", '\"') // double quote ; } -} unesc_char; +} unesc_char_csv; template struct literal : x3::parser> @@ -93,7 +93,7 @@ auto const column_def = quoted_text | *(char_ - separator); auto const quoted_text_def = quote > text > quote // support unmatched quotes or not (??) ; -auto const text_def = *(unesc_char | (char_ - quote)); +auto const text_def = *(unesc_char_csv | (char_ - quote)); BOOST_SPIRIT_DEFINE(line, column, quoted_text, text);