Merge branch 'master' into develop

This commit is contained in:
paulfd 2019-09-25 23:50:45 +02:00
commit a0b9e33ab0

View file

@ -60,7 +60,7 @@ private:
}; };
std::atomic<int> count { 0 }; std::atomic<int> count { 0 };
}; };
static ObjectCounter objectCounter; inline static ObjectCounter objectCounter;
}; };
#ifndef NDEBUG #ifndef NDEBUG
@ -74,4 +74,4 @@ private:
#else #else
#define LEAK_DETECTOR(Class) #define LEAK_DETECTOR(Class)
#endif #endif