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

include guards - add missing and normalise namings

Browse source
This commit is contained in:
artemp 2016-12-20 17:45:38 +01:00
parent b73901edab
commit 7f4fd0cc76
7 changed files with 34 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/mapnik/agg_render_marker.hpp
View file

@ -20,6 +20,9 @@
*
*****************************************************************************/
#ifndef MAPNIK_AGG_RENDER_MARKER_HPP
#define MAPNIK_AGG_RENDER_MARKER_HPP
#include <mapnik/color.hpp>
#include <mapnik/feature.hpp>
#include <mapnik/geom_util.hpp>
@ -148,3 +151,5 @@ void render_raster_marker(RendererType renb, RasterizerType & ras, image_rgba8 c
}
}
#endif // MAPNIK_AGG_RENDER_MARKER_HPP

9
include/mapnik/csv/csv_grammar_x3_def.hpp
View file

@ -20,11 +20,15 @@
*
*****************************************************************************/
#ifndef MAPNIK_CSV_GRAMMAR_X3_DEF_HPP
#define MAPNIK_CSV_GRAMMAR_X3_DEF_HPP
#pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp>
#include <mapnik/csv/csv_grammar_x3.hpp>
#pragma GCC diagnostic pop
#include <iostream>
namespace mapnik { namespace grammar {
namespace x3 = boost::spirit::x3;
@ -111,3 +115,6 @@ grammar::csv_line_grammar_type const& csv_line_grammar()
}
} // namespace mapnik
#endif // MAPNIK_CSV_GRAMMAR_X3_DEF_HPP

6
include/mapnik/json/geometry_grammar_x3_def.hpp
View file

@ -20,6 +20,9 @@
*
*****************************************************************************/
#ifndef MAPNIK_JSON_GEOMETRY_GRAMMAR_X3_DEF_HPP
#define MAPNIK_JSON_GEOMETRY_GRAMMAR_X3_DEF_HPP
// mapnik
#include <mapnik/json/geometry_grammar_x3.hpp>
#include <mapnik/json/positions_grammar_x3.hpp>
@ -153,3 +156,6 @@ grammar::geometry_grammar_type const& geometry_grammar()
return grammar::geometry;
}
}}
#endif // MAPNIK_JSON_GEOMETRY_GRAMMAR_X3_DEF_HPP

7
include/mapnik/stringify_macro.hpp
View file

@ -20,7 +20,12 @@
*
*****************************************************************************/
#ifndef MAPNIK_STRINGIFY_MACRO_HPP
#define MAPNIK_STRINGIFY_MACRO_HPP
#ifndef MAPNIK_STRINGIFY
#define MAPNIK_STRINGIFY(n) MAPNIK_STRINGIFY_HELPER(n)
#define MAPNIK_STRINGIFY_HELPER(n) #n
#endif
#endif
#endif // MAPNIK_STRINGIFY_MACRO_HPP

6
include/mapnik/svg/output/svg_output_attributes.hpp
View file

@ -20,8 +20,8 @@
*
*****************************************************************************/
#ifndef MAPNIK_SVG_OUTPUT_ATTRIBUTES
#define MAPNIK_SVG_OUTPUT_ATTRIBUTES
#ifndef MAPNIK_SVG_OUTPUT_ATTRIBUTES_HPP
#define MAPNIK_SVG_OUTPUT_ATTRIBUTES_HPP
// mapnik
#include <mapnik/color.hpp>
@ -199,4 +199,4 @@ namespace mapnik { namespace svg {
};
}}
#endif // MAPNIK_SVG_OUTPUT_ATTRIBUTES
#endif // MAPNIK_SVG_OUTPUT_ATTRIBUTES_HPP

6
include/mapnik/xml_node.hpp
View file

@ -20,8 +20,8 @@
*
*****************************************************************************/
#ifndef MAPNIK_XML_NODE_H
#define MAPNIK_XML_NODE_H
#ifndef MAPNIK_XML_NODE_HPP
#define MAPNIK_XML_NODE_HPP
//mapnik
#include <mapnik/config.hpp> // for MAPNIK_DECL
@ -150,4 +150,4 @@ private:
} //ns mapnik
#endif // MAPNIK_XML_NODE_H
#endif // MAPNIK_XML_NODE_HPP

6
include/mapnik/xml_tree.hpp
View file

@ -20,8 +20,8 @@
*
*****************************************************************************/
#ifndef MAPNIK_XML_TREE_H
#define MAPNIK_XML_TREE_H
#ifndef MAPNIK_XML_TREE_HPP
#define MAPNIK_XML_TREE_HPP
// mapnik
#include <mapnik/xml_node.hpp>
@ -50,4 +50,4 @@ public:
} //ns mapnik
#endif // MAPNIK_XML_TREE_H
#endif // MAPNIK_XML_TREE_HPP