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

restoring symbol duplications effort

Browse source
This commit is contained in:
Artem Pavlenko 2018-03-15 15:28:56 +01:00
parent 47ba9c63d2
commit 69a58346ec
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
demo/c++/build.py
View file

@ -36,7 +36,7 @@ demo_env = env.Clone()
demo_env['CXXFLAGS'] = copy(env['LIBMAPNIK_CXXFLAGS'])
demo_env.Append(CPPDEFINES = env['LIBMAPNIK_DEFINES'])
demo_env['LINKFLAGS'] = '-l%s ' % env['MAPNIK_NAME'] + demo_env['LINKFLAGS']
demo_env['LINKFLAGS'] = '-l%s -lmapnik-json' % env['MAPNIK_NAME'] + demo_env['LINKFLAGS']
if env['HAS_CAIRO']:
demo_env.PrependUnique(CPPPATH=env['CAIRO_CPPPATHS'])

4
include/mapnik/expression_grammar_x3_def.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_EXPRESSIONS_GRAMMAR_X3_DEF_HPP
#include <mapnik/expression_grammar_x3.hpp>
#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
#include <mapnik/json/unicode_string_grammar_x3.hpp>
#include <mapnik/expression_node.hpp>
#include <mapnik/function_call.hpp>
#include <mapnik/unicode.hpp>
@ -67,7 +67,7 @@ namespace mapnik { namespace grammar {
x3::uint_parser<char, 16, 2, 2> const hex2 {};
namespace {
auto const& escaped_unicode = json::grammar::escaped_unicode;
auto const& escaped_unicode = json::escaped_unicode_grammar();
}
auto append = [](auto const& ctx)

1
src/expression_grammar_x3.cpp
View file

@ -22,7 +22,6 @@
#include <mapnik/expression_grammar_x3_def.hpp>
#include <mapnik/expression_grammar_x3_config.hpp>
#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
namespace mapnik { namespace json { namespace grammar {