archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity

iwyu

Browse Source
This commit is contained in:
Dane Springmeyer 2013-01-03 23:56:11 -08:00
parent a75cfa111b
commit e9343ca32c
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/json/feature_grammar.cpp
View File

@ -149,8 +149,8 @@ feature_grammar<Iterator,FeatureType>::feature_grammar(mapnik::transcoder const&
}
template struct mapnik::json::feature_grammar<std::string::const_iterator,mapnik::Feature>;
template struct mapnik::json::feature_grammar<boost::spirit::multi_pass<std::istreambuf_iterator<char> >,mapnik::Feature>;
template struct mapnik::json::feature_grammar<std::string::const_iterator,mapnik::feature_impl>;
template struct mapnik::json::feature_grammar<boost::spirit::multi_pass<std::istreambuf_iterator<char> >,mapnik::feature_impl>;
}}

5
src/json/geojson_generator.cpp
View File

@ -22,6 +22,7 @@
// boost
#include <boost/version.hpp>
#include <mapnik/feature.hpp>
#include <mapnik/json/geojson_generator.hpp>
#if BOOST_VERSION >= 104700
@ -37,7 +38,7 @@ feature_generator::feature_generator()
feature_generator::~feature_generator() {}
bool feature_generator::generate(std::string & geojson, mapnik::Feature const& f)
bool feature_generator::generate(std::string & geojson, mapnik::feature_impl const& f)
{
sink_type sink(geojson);
return karma::generate(sink, *grammar_,f);
@ -65,7 +66,7 @@ bool geometry_generator::generate(std::string & geojson, mapnik::geometry_contai
namespace mapnik { namespace json {
bool feature_generator::generate(std::string & geojson, mapnik::Feature const& f)
bool feature_generator::generate(std::string & geojson, mapnik::feature_impl const& f)
{
std::ostringstream s;
s << BOOST_VERSION/100000 << "." << BOOST_VERSION/100 % 1000 << "." << BOOST_VERSION % 100;

3
src/placement_finder.cpp
View File

@ -21,6 +21,7 @@
*****************************************************************************/
//mapnik
#include <mapnik/feature.hpp>
#include <mapnik/placement_finder.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/text_path.hpp>
@ -95,7 +96,7 @@ double get_total_distance(T & shape_path)
}
template <typename DetectorT>
placement_finder<DetectorT>::placement_finder(Feature const& feature,
placement_finder<DetectorT>::placement_finder(feature_impl const& feature,
text_placement_info const& placement_info,
string_info const& info,
DetectorT & detector,

3
src/symbolizer.cpp
View File

@ -21,13 +21,14 @@
*****************************************************************************/
//mapnik
#include <mapnik/feature.hpp>
#include <mapnik/symbolizer.hpp>
#include <mapnik/map.hpp>
#include <mapnik/transform_processor.hpp>
namespace mapnik {
void evaluate_transform(agg::trans_affine& tr, Feature const& feature,
void evaluate_transform(agg::trans_affine& tr, feature_impl const& feature,
transform_list_ptr const& trans_expr)
{
if (trans_expr)

2
src/text_properties.cpp
View File

@ -63,7 +63,7 @@ text_symbolizer_properties::text_symbolizer_properties() :
}
void text_symbolizer_properties::process(processed_text &output, Feature const& feature) const
void text_symbolizer_properties::process(processed_text &output, feature_impl const& feature) const
{
output.clear();
if (tree_) {