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

workaround c++11 compile error due to ambiguous std::vector::insert usage - closes #1973

Browse source
This commit is contained in:
Dane Springmeyer 2013-07-30 15:14:47 -04:00
parent dd5bb6c643
commit 13343eb5be
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bindings/python/mapnik_text_placement.cpp
View file

@ -194,13 +194,16 @@ struct ListNodeWrap: formatting::list_node, wrapper<formatting::list_node>
ListNodeWrap(object l) : formatting::list_node(), wrapper<formatting::list_node>() ListNodeWrap(object l) : formatting::list_node(), wrapper<formatting::list_node>()
{ {
stl_input_iterator<formatting::node_ptr> begin(l), end; stl_input_iterator<formatting::node_ptr> begin(l), end;
children_.insert(children_.end(), begin, end); while (begin != end)
{
children_.push_back(*begin);
++begin;
}
} }
/* TODO: Add constructor taking variable number of arguments. /* TODO: Add constructor taking variable number of arguments.
http://wiki.python.org/moin/boost.python/HowTo#A.22Raw.22_function */ http://wiki.python.org/moin/boost.python/HowTo#A.22Raw.22_function */
virtual void apply(char_properties const& p, feature_impl const& feature, processed_text &output) const virtual void apply(char_properties const& p, feature_impl const& feature, processed_text &output) const
{ {
if(override o = this->get_override("apply")) if(override o = this->get_override("apply"))

2
tests/visual_tests/test_python.py
View file

@ -104,6 +104,6 @@ for format_tree in format_trees:
expected = os.path.join(dirname,"images", 'python-%s-reference.png' % format_tree[0]) expected = os.path.join(dirname,"images", 'python-%s-reference.png' % format_tree[0])
mapnik.render_to_file(m, actual, 'png8:m=h') mapnik.render_to_file(m, actual, 'png8:m=h')
diff = compare(actual,expected) diff = compare(actual,expected)
if diff > 1: if diff > 0:
print 'comparision failed between:\n %s (actual)\n %s (expected)' % (actual,expected) print 'comparision failed between:\n %s (actual)\n %s (expected)' % (actual,expected)