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

avoid clang++ -pedantic compiler warnings

Browse source
This commit is contained in:
Dane Springmeyer 2011-04-01 06:24:57 +00:00
parent d148be9fa2
commit 84ea9e6101
16 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bindings/python/mapnik_python.cpp
View file

@ -310,11 +310,11 @@ bool has_pycairo()
} }
BOOST_PYTHON_FUNCTION_OVERLOADS(load_map_overloads, load_map, 2, 3); BOOST_PYTHON_FUNCTION_OVERLOADS(load_map_overloads, load_map, 2, 3)
BOOST_PYTHON_FUNCTION_OVERLOADS(load_map_string_overloads, load_map_string, 2, 4); BOOST_PYTHON_FUNCTION_OVERLOADS(load_map_string_overloads, load_map_string, 2, 4)
BOOST_PYTHON_FUNCTION_OVERLOADS(save_map_overloads, save_map, 2, 3); BOOST_PYTHON_FUNCTION_OVERLOADS(save_map_overloads, save_map, 2, 3)
BOOST_PYTHON_FUNCTION_OVERLOADS(save_map_to_string_overloads, save_map_to_string, 1, 2); BOOST_PYTHON_FUNCTION_OVERLOADS(save_map_to_string_overloads, save_map_to_string, 1, 2)
BOOST_PYTHON_FUNCTION_OVERLOADS(render_overloads, render, 2, 5); BOOST_PYTHON_FUNCTION_OVERLOADS(render_overloads, render, 2, 5)
BOOST_PYTHON_MODULE(_mapnik2) BOOST_PYTHON_MODULE(_mapnik2)
{ {

4
bindings/python/mapnik_svg.hpp
View file

@ -37,7 +37,7 @@ template <class T>
const std::string get_svg_transform(T& symbolizer) const std::string get_svg_transform(T& symbolizer)
{ {
return symbolizer.get_transform_string(); return symbolizer.get_transform_string();
}; }
template <class T> template <class T>
void set_svg_transform(T& symbolizer, std::string const& transform_wkt) void set_svg_transform(T& symbolizer, std::string const& transform_wkt)
@ -52,7 +52,7 @@ void set_svg_transform(T& symbolizer, std::string const& transform_wkt)
mapnik::transform_type matrix; mapnik::transform_type matrix;
tr.store_to(&matrix[0]); tr.store_to(&matrix[0]);
symbolizer.set_transform(matrix); symbolizer.set_transform(matrix);
}; }
} // end of namespace mapnik } // end of namespace mapnik

2
include/mapnik/ellipsoid.hpp
View file

@ -33,4 +33,4 @@ struct ellipsoid
}; };
} }
#endif // MAPNIK_ELLIPSOID_HPP #endif // MAPNIK_ELLIPSOID_HPP

2
include/mapnik/filter_featureset.hpp
View file

@ -54,4 +54,4 @@ private:
}; };
} }
#endif //MAPNIK_FILTER_FEATURESET_HPP #endif //MAPNIK_FILTER_FEATURESET_HPP

2
include/mapnik/markers_placement.hpp
View file

@ -242,5 +242,5 @@ template <typename Locator, typename Detector> box2d<double> markers_placement<L
return box2d<double>(x1_, y1_, x2_, y2_); return box2d<double>(x1_, y1_, x2_, y2_);
} }
}; /* end namespace */ } /* end namespace */
#endif // MARKERS_PLACEMENT_HPP #endif // MARKERS_PLACEMENT_HPP

2
include/mapnik/metawriter_factory.hpp
View file

@ -49,7 +49,7 @@ void metawriter_save(
boost::property_tree::ptree &pt, boost::property_tree::ptree &pt,
bool explicit_defaults); bool explicit_defaults);
}; }
#endif /* METAWRITER_FACTORY_HPP */ #endif /* METAWRITER_FACTORY_HPP */

4
include/mapnik/metawriter_json.hpp
View file

@ -72,7 +72,7 @@ protected:
enum { enum {
HEADER_NOT_WRITTEN = -1, HEADER_NOT_WRITTEN = -1,
STOPPED = -2, STOPPED = -2,
STARTED = 0, STARTED = 0
}; };
/** Features written. */ /** Features written. */
int count_; int count_;
@ -140,6 +140,6 @@ protected:
/** Shared pointer to metawriter_json object. */ /** Shared pointer to metawriter_json object. */
typedef boost::shared_ptr<metawriter_json> metawriter_json_ptr; typedef boost::shared_ptr<metawriter_json> metawriter_json_ptr;
}; }
#endif #endif

16
include/mapnik/ptree_helpers.hpp
View file

@ -215,15 +215,15 @@ struct name_trait
}; };
#define DEFINE_NAME_TRAIT( type ) \ #define DEFINE_NAME_TRAIT( type ) \
DEFINE_NAME_TRAIT_WITH_NAME( type, #type ); DEFINE_NAME_TRAIT_WITH_NAME( type, #type )
DEFINE_NAME_TRAIT( double ); DEFINE_NAME_TRAIT( double )
DEFINE_NAME_TRAIT( float ); DEFINE_NAME_TRAIT( float )
DEFINE_NAME_TRAIT( unsigned ); DEFINE_NAME_TRAIT( unsigned )
DEFINE_NAME_TRAIT( boolean ); DEFINE_NAME_TRAIT( boolean )
DEFINE_NAME_TRAIT_WITH_NAME( int, "integer" ); DEFINE_NAME_TRAIT_WITH_NAME( int, "integer" )
DEFINE_NAME_TRAIT_WITH_NAME( std::string, "string" ); DEFINE_NAME_TRAIT_WITH_NAME( std::string, "string" )
DEFINE_NAME_TRAIT_WITH_NAME( color, "color" ); DEFINE_NAME_TRAIT_WITH_NAME( color, "color" )
template <typename ENUM, int MAX> template <typename ENUM, int MAX>
struct name_trait< mapnik::enumeration<ENUM, MAX> > struct name_trait< mapnik::enumeration<ENUM, MAX> >

2
include/mapnik/text_placements_simple.hpp
View file

@ -36,7 +36,7 @@ typedef enum {
SOUTHEAST, SOUTHEAST,
NORTHWEST, NORTHWEST,
SOUTHWEST, SOUTHWEST,
EXACT_POSITION, EXACT_POSITION
} directions_t; } directions_t;
/** Simple placement strategy. /** Simple placement strategy.

2
src/glyph_symbolizer.cpp
View file

@ -10,7 +10,7 @@ static const char * angle_mode_strings[] = {
"" ""
}; };
IMPLEMENT_ENUM( angle_mode_e, angle_mode_strings ); IMPLEMENT_ENUM( angle_mode_e, angle_mode_strings )
text_path_ptr glyph_symbolizer::get_text_path(face_set_ptr const& faces, text_path_ptr glyph_symbolizer::get_text_path(face_set_ptr const& faces,
Feature const& feature) const Feature const& feature) const

2
src/gradient.cpp
View file

@ -33,7 +33,7 @@ static const char * gradient_strings[] = {
"" ""
}; };
IMPLEMENT_ENUM( gradient_e, gradient_strings ); IMPLEMENT_ENUM( gradient_e, gradient_strings )
gradient::gradient() gradient::gradient()

4
src/markers_symbolizer.cpp
View file

@ -32,7 +32,7 @@ static const char * marker_placement_strings[] = {
"" ""
}; };
IMPLEMENT_ENUM( marker_placement_e, marker_placement_strings ); IMPLEMENT_ENUM( marker_placement_e, marker_placement_strings )
static const char * marker_type_strings[] = { static const char * marker_type_strings[] = {
@ -41,7 +41,7 @@ static const char * marker_type_strings[] = {
"" ""
}; };
IMPLEMENT_ENUM( marker_type_e, marker_type_strings ); IMPLEMENT_ENUM( marker_type_e, marker_type_strings )
markers_symbolizer::markers_symbolizer() markers_symbolizer::markers_symbolizer()
: symbolizer_with_image(path_expression_ptr(new path_expression)), : symbolizer_with_image(path_expression_ptr(new path_expression)),

2
src/metawriter.cpp
View file

@ -358,4 +358,4 @@ path_expression_ptr metawriter_json::get_filename() const
return fn_; return fn_;
} }
}; }

2
src/point_symbolizer.cpp
View file

@ -40,7 +40,7 @@ static const char * point_placement_strings[] = {
"" ""
}; };
IMPLEMENT_ENUM( point_placement_e, point_placement_strings ); IMPLEMENT_ENUM( point_placement_e, point_placement_strings )
point_symbolizer::point_symbolizer() point_symbolizer::point_symbolizer()
: symbolizer_with_image(path_expression_ptr(new path_expression)), // FIXME : symbolizer_with_image(path_expression_ptr(new path_expression)), // FIXME

2
src/polygon_pattern_symbolizer.cpp
View file

@ -33,7 +33,7 @@ static const char * pattern_alignment_strings[] = {
"" ""
}; };
IMPLEMENT_ENUM( pattern_alignment_e, pattern_alignment_strings ); IMPLEMENT_ENUM( pattern_alignment_e, pattern_alignment_strings )
polygon_pattern_symbolizer::polygon_pattern_symbolizer(path_expression_ptr file) polygon_pattern_symbolizer::polygon_pattern_symbolizer(path_expression_ptr file)
: symbolizer_with_image(file), symbolizer_base(), : symbolizer_with_image(file), symbolizer_base(),

10
src/text_symbolizer.cpp
View file

@ -39,7 +39,7 @@ static const char * label_placement_strings[] = {
}; };
IMPLEMENT_ENUM( label_placement_e, label_placement_strings ); IMPLEMENT_ENUM( label_placement_e, label_placement_strings )
static const char * vertical_alignment_strings[] = { static const char * vertical_alignment_strings[] = {
"top", "top",
@ -50,7 +50,7 @@ static const char * vertical_alignment_strings[] = {
}; };
IMPLEMENT_ENUM( vertical_alignment_e, vertical_alignment_strings ); IMPLEMENT_ENUM( vertical_alignment_e, vertical_alignment_strings )
static const char * horizontal_alignment_strings[] = { static const char * horizontal_alignment_strings[] = {
"left", "left",
@ -61,7 +61,7 @@ static const char * horizontal_alignment_strings[] = {
}; };
IMPLEMENT_ENUM( horizontal_alignment_e, horizontal_alignment_strings ); IMPLEMENT_ENUM( horizontal_alignment_e, horizontal_alignment_strings )
static const char * justify_alignment_strings[] = { static const char * justify_alignment_strings[] = {
"left", "left",
@ -71,7 +71,7 @@ static const char * justify_alignment_strings[] = {
}; };
IMPLEMENT_ENUM( justify_alignment_e, justify_alignment_strings ); IMPLEMENT_ENUM( justify_alignment_e, justify_alignment_strings )
static const char * text_transform_strings[] = { static const char * text_transform_strings[] = {
"none", "none",
@ -82,7 +82,7 @@ static const char * text_transform_strings[] = {
}; };
IMPLEMENT_ENUM( text_transform_e, text_transform_strings ); IMPLEMENT_ENUM( text_transform_e, text_transform_strings )