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

restore support for single threaded build

Browse source
This commit is contained in:
Dane Springmeyer 2015-09-30 14:23:46 -07:00
parent 7122fdc6e5
commit 761093457a
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/mapnik/util/singleton.hpp
View file

@ -31,7 +31,10 @@
#include <new> // operator new
#include <type_traits>
#include <atomic>
#ifdef MAPNIK_THREADSAFE
#include <mutex>
#endif
namespace mapnik
{
@ -97,7 +100,9 @@ template <typename T,
}
protected:
#ifdef MAPNIK_THREADSAFE
static std::mutex mutex_;
#endif
singleton() {}
public:
@ -106,7 +111,9 @@ template <typename T,
T * tmp = pInstance_.load(std::memory_order_acquire);
if (tmp == nullptr)
{
#ifdef MAPNIK_THREADSAFE
std::lock_guard<std::mutex> lock(mutex_);
#endif
tmp = pInstance_.load(std::memory_order_relaxed);
if (tmp == nullptr)
{
@ -130,8 +137,10 @@ template <typename T,
}
};
#ifdef MAPNIK_THREADSAFE
template <typename T,
template <typename U> class CreatePolicy> std::mutex singleton<T,CreatePolicy>::mutex_;
#endif
template <typename T,
template <typename U> class CreatePolicy> std::atomic<T*> singleton<T,CreatePolicy>::pInstance_;
template <typename T,