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

fix namespacing for wkt generator code - refs #1330

Browse source
This commit is contained in:
Dane Springmeyer 2012-08-22 09:54:01 -07:00
parent bf559f9720
commit 948531e9d0
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/mapnik/util/geometry_wkt_generator.hpp
View file

@ -56,7 +56,7 @@ namespace mapnik { namespace util {
namespace karma = boost::spirit::karma;
namespace phoenix = boost::phoenix;
namespace {
namespace detail {
struct get_type
{
@ -130,10 +130,10 @@ struct wkt_generator :
karma::rule<OutputIterator, geometry_type::value_type (unsigned& )> polygon_coord;
// phoenix functions
phoenix::function<get_type > _type;
phoenix::function<get_first> _first;
phoenix::function<detail::get_type > _type;
phoenix::function<detail::get_first> _first;
//
karma::real_generator<double, wkt_coordinate_policy<double> > coord_type;
karma::real_generator<double, detail::wkt_coordinate_policy<double> > coord_type;
};
@ -150,9 +150,9 @@ struct wkt_multi_generator :
karma::rule<OutputIterator, geometry_container const& ()> multi_geometry;
wkt_generator<OutputIterator> path;
// phoenix
phoenix::function<multi_geometry_> is_multi;
phoenix::function<multi_geometry_type> _multi_type;
phoenix::function<get_type > _type;
phoenix::function<detail::multi_geometry_> is_multi;
phoenix::function<detail::multi_geometry_type> _multi_type;
phoenix::function<detail::get_type > _type;
//
karma::symbols<unsigned, char const*> geometry_types;
};

2
src/wkt/wkt_generator.cpp
View file

@ -30,7 +30,7 @@
namespace mapnik { namespace util {
boost::tuple<unsigned,bool> multi_geometry_type::operator() (geometry_container const& geom) const
boost::tuple<unsigned,bool> detail::multi_geometry_type::operator() (geometry_container const& geom) const
{
unsigned type = 0u;
bool collection = false;