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

Added visibility attribute to XML symbols.

Browse source 
Thanks to @flippmoke, symbol visibility is exactly the cause of
the previous compilation error. Until it's decided whether or not
to turn this off (at least for testing & coverage builds?), I've
added the necessary annotations to allow it to compile.
This commit is contained in:
Matt Amos 2015-06-02 18:10:59 +01:00
parent b21ed59190
commit dd112b33e2
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/mapnik/xml_loader.hpp
View file

@ -28,9 +28,9 @@
namespace mapnik namespace mapnik
{ {
class xml_node; class MAPNIK_DECL xml_node;
void read_xml(std::string const & filename, xml_node &node); MAPNIK_DECL void read_xml(std::string const & filename, xml_node &node);
void read_xml_string(std::string const & str, xml_node &node, std::string const & base_path=""); MAPNIK_DECL void read_xml_string(std::string const & str, xml_node &node, std::string const & base_path="");
} }
#endif // MAPNIK_LIBXML2_LOADER_HPP #endif // MAPNIK_LIBXML2_LOADER_HPP

12
include/mapnik/xml_node.hpp
View file

@ -34,9 +34,9 @@
namespace mapnik namespace mapnik
{ {
class xml_tree; class MAPNIK_DECL xml_tree;
class xml_attribute class MAPNIK_DECL xml_attribute
{ {
public: public:
xml_attribute(const char * value_); xml_attribute(const char * value_);
@ -44,7 +44,7 @@ public:
mutable bool processed; mutable bool processed;
}; };
class node_not_found: public std::exception class MAPNIK_DECL node_not_found: public std::exception
{ {
public: public:
node_not_found(std::string const& node_name); node_not_found(std::string const& node_name);
@ -56,7 +56,7 @@ protected:
mutable std::string msg_; mutable std::string msg_;
}; };
class attribute_not_found: public std::exception class MAPNIK_DECL attribute_not_found: public std::exception
{ {
public: public:
attribute_not_found(std::string const& node_name, std::string const& attribute_name); attribute_not_found(std::string const& node_name, std::string const& attribute_name);
@ -69,7 +69,7 @@ protected:
mutable std::string msg_; mutable std::string msg_;
}; };
class more_than_one_child: public std::exception class MAPNIK_DECL more_than_one_child: public std::exception
{ {
public: public:
more_than_one_child(std::string const& node_name); more_than_one_child(std::string const& node_name);
@ -81,7 +81,7 @@ protected:
mutable std::string msg_; mutable std::string msg_;
}; };
class xml_node class MAPNIK_DECL xml_node
{ {
public: public:
using const_iterator = std::list<xml_node>::const_iterator; using const_iterator = std::list<xml_node>::const_iterator;

2
include/mapnik/xml_tree.hpp
View file

@ -33,7 +33,7 @@
namespace mapnik namespace mapnik
{ {
class xml_tree class MAPNIK_DECL xml_tree
{ {
public: public:
xml_tree(std::string const& encoding="utf8"); xml_tree(std::string const& encoding="utf8");