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

+ fixed template parameter shadowing (clang++)

Browse source
This commit is contained in:
Dane Springmeyer 2010-07-24 01:33:38 +00:00
parent e7b2a5dd4a
commit ea43202344
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/mapnik/utils.hpp
View file

@ -96,7 +96,7 @@ namespace mapnik
};
template <typename T,
template <typename T> class CreatePolicy=CreateStatic> class singleton
template <typename U> class CreatePolicy=CreateStatic> class singleton
{
#ifdef __SUNPRO_CC
/* Sun's C++ compiler will issue the following errors if CreatePolicy<T> is used:
@ -159,13 +159,13 @@ namespace mapnik
};
#ifdef MAPNIK_THREADSAFE
template <typename T,
template <typename T> class CreatePolicy> mutex singleton<T,CreatePolicy>::mutex_;
template <typename U> class CreatePolicy> mutex singleton<T,CreatePolicy>::mutex_;
#endif
template <typename T,
template <typename T> class CreatePolicy> T* singleton<T,CreatePolicy>::pInstance_=0;
template <typename U> class CreatePolicy> T* singleton<T,CreatePolicy>::pInstance_=0;
template <typename T,
template <typename T> class CreatePolicy> bool singleton<T,CreatePolicy>::destroyed_=false;
template <typename U> class CreatePolicy> bool singleton<T,CreatePolicy>::destroyed_=false;
}