sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve double defined symbol

Browse source
This commit is contained in:
Mathis Logemann 2022-08-23 21:37:06 +02:00
parent b9379f9024
commit 4cd4985e75
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/mapnik/csv/csv_grammar_x3_def.hpp
View file

@ -39,9 +39,9 @@ using standard::char_;
using x3::lexeme; using x3::lexeme;
using x3::lit; using x3::lit;
struct unesc_char_ : x3::symbols<char> struct unesc_char_csv_ : x3::symbols<char>
{ {
unesc_char_() unesc_char_csv_()
{ {
add("\\a", '\a') // add("\\a", '\a') //
("\\b", '\b') // ("\\b", '\b') //
@ -56,7 +56,7 @@ struct unesc_char_ : x3::symbols<char>
("\"\"", '\"') // double quote ("\"\"", '\"') // double quote
; ;
} }
} unesc_char; } unesc_char_csv;
template<typename T> template<typename T>
struct literal : x3::parser<literal<T>> struct literal : x3::parser<literal<T>>
@ -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 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); BOOST_SPIRIT_DEFINE(line, column, quoted_text, text);