From d36a7323ac97fd689263a83fb2c07c7b5ae58468 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 9 May 2013 18:22:40 -0700 Subject: [PATCH] support -fvisibility=hidden in core library - refs #1826 --- include/mapnik/config_error.hpp | 4 +++- include/mapnik/expression_grammar.hpp | 3 ++- include/mapnik/feature_style_processor.hpp | 3 ++- include/mapnik/json/feature_collection_parser.hpp | 2 +- include/mapnik/value_error.hpp | 4 +++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/mapnik/config_error.hpp b/include/mapnik/config_error.hpp index c37d5617c..4da90c4e8 100644 --- a/include/mapnik/config_error.hpp +++ b/include/mapnik/config_error.hpp @@ -23,6 +23,8 @@ #ifndef MAPNIK_CONFIG_ERROR_HPP #define MAPNIK_CONFIG_ERROR_HPP +#include + #include #include @@ -30,7 +32,7 @@ namespace mapnik { class xml_node; -class config_error : public std::exception +class MAPNIK_DECL config_error : public std::exception { public: config_error(std::string const& what); diff --git a/include/mapnik/expression_grammar.hpp b/include/mapnik/expression_grammar.hpp index 2702048a3..07501484e 100644 --- a/include/mapnik/expression_grammar.hpp +++ b/include/mapnik/expression_grammar.hpp @@ -24,6 +24,7 @@ #define MAPNIK_EXPRESSIONS_GRAMMAR_HPP // mapnik +#include #include #include #include @@ -116,7 +117,7 @@ struct integer_parser }; template -struct expression_grammar : qi::grammar +struct MAPNIK_DECL expression_grammar : qi::grammar { typedef qi::rule rule_type; diff --git a/include/mapnik/feature_style_processor.hpp b/include/mapnik/feature_style_processor.hpp index 69752b37f..e880c3461 100644 --- a/include/mapnik/feature_style_processor.hpp +++ b/include/mapnik/feature_style_processor.hpp @@ -25,6 +25,7 @@ // mapnik #include // for featureset_ptr +#include // stl #include @@ -48,7 +49,7 @@ enum eAttributeCollectionPolicy }; template -class feature_style_processor +class MAPNIK_DECL feature_style_processor { struct symbol_dispatch; public: diff --git a/include/mapnik/json/feature_collection_parser.hpp b/include/mapnik/json/feature_collection_parser.hpp index 454d69a98..adc91119f 100644 --- a/include/mapnik/json/feature_collection_parser.hpp +++ b/include/mapnik/json/feature_collection_parser.hpp @@ -40,7 +40,7 @@ namespace mapnik { namespace json { template struct feature_collection_grammar; template -class feature_collection_parser : private mapnik::noncopyable +class MAPNIK_DECL feature_collection_parser : private mapnik::noncopyable { typedef Iterator iterator_type; typedef mapnik::feature_impl feature_type; diff --git a/include/mapnik/value_error.hpp b/include/mapnik/value_error.hpp index 08786cf18..c88ef5f24 100644 --- a/include/mapnik/value_error.hpp +++ b/include/mapnik/value_error.hpp @@ -23,12 +23,14 @@ #ifndef MAPNIK_VALUE_ERROR_HPP #define MAPNIK_VALUE_ERROR_HPP +#include + #include #include namespace mapnik { -class value_error : public std::exception +class MAPNIK_DECL value_error : public std::exception { public: value_error() :