From 7122fdc6e53f2d40855421832e1aeab9a238ab36 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 30 Sep 2015 14:23:21 -0700 Subject: [PATCH] fix #3096 --- src/debug.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/debug.cpp b/src/debug.cpp index f41f84c8a..169272f09 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -43,22 +43,22 @@ namespace mapnik { -// mutexes - #ifdef MAPNIK_THREADSAFE + std::mutex logger::severity_mutex_; std::mutex logger::format_mutex_; -#endif - - -// first time checks std::atomic logger::severity_env_check_ {true}; std::atomic logger::format_env_check_ {true}; -// severity - std::atomic logger::severity_level_ { +#else + +bool logger::severity_env_check_ {true}; +bool logger::format_env_check_ {true}; + +logger::severity_type logger::severity_level_ { +#endif #if MAPNIK_DEFAULT_LOG_SEVERITY == 0 logger::debug #elif MAPNIK_DEFAULT_LOG_SEVERITY == 1