Merge branch 'master' into develop

2019-09-25 23:50:45 +02:00 · 2019-09-25 23:50:45 +02:00 · a0b9e33ab0
commit a0b9e33ab0
parent ca5726fe15 a63c3862bd
1 changed files with 2 additions and 2 deletions
--- a/sfizz/LeakDetector.h
+++ b/sfizz/LeakDetector.h
@ -60,7 +60,7 @@ private:
        };
        std::atomic<int> count { 0 };
    };
-	static ObjectCounter objectCounter;
+	inline static ObjectCounter objectCounter;
 };

 #ifndef NDEBUG