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

msvc on windows breaks with singleton declared but gcc needs default visibility to avoid double singleton registration across dlls when using -fvisiblity=hidden

Browse source
This commit is contained in:
Dane Springmeyer 2013-05-17 13:16:36 -07:00
parent 2393453765
commit 03d8b6d9d7
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/mapnik/utils.hpp
View file

@ -94,9 +94,16 @@ public:
} }
}; };
#ifdef __GNUC__
template <typename T, template <typename T,
template <typename U> class CreatePolicy=CreateStatic> class MAPNIK_EXP singleton template <typename U> class CreatePolicy=CreateStatic> class MAPNIK_DECL singleton
{ {
#else
template <typename T,
template <typename U> class CreatePolicy=CreateStatic> class singleton
{
#endif
#ifdef __SUNPRO_CC #ifdef __SUNPRO_CC
/* Sun's C++ compiler will issue the following errors if CreatePolicy<T> is used: /* Sun's C++ compiler will issue the following errors if CreatePolicy<T> is used:
Error: A class template name was expected instead of mapnik::CreatePolicy<mapnik::T> Error: A class template name was expected instead of mapnik::CreatePolicy<mapnik::T>