diff options
author | Thierry Crozat | 2017-07-03 18:59:12 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2017-07-10 21:11:20 +0200 |
commit | eefa72afa1978a9dea10f5b1833fcc8f58a3468e (patch) | |
tree | 97ef0c982cad7cc54cf93c0f6a6cec3d072b1a69 /common | |
parent | 1141bfc1a603decce8f02a85a1fc76073a646d1a (diff) | |
download | scummvm-rg350-eefa72afa1978a9dea10f5b1833fcc8f58a3468e.tar.gz scummvm-rg350-eefa72afa1978a9dea10f5b1833fcc8f58a3468e.tar.bz2 scummvm-rg350-eefa72afa1978a9dea10f5b1833fcc8f58a3468e.zip |
COMMON: Change way the Singleton instances are instantiated
This fixes tons of warnings with clang from a recent xcode version on
macOS (and possibly other systems) complaining that an instantiation
of _singleton is required but no definition is available.
Diffstat (limited to 'common')
-rw-r--r-- | common/archive.cpp | 2 | ||||
-rw-r--r-- | common/config-manager.cpp | 2 | ||||
-rw-r--r-- | common/coroutines.cpp | 2 | ||||
-rw-r--r-- | common/debug.cpp | 2 | ||||
-rw-r--r-- | common/osd_message_queue.cpp | 2 | ||||
-rw-r--r-- | common/singleton.h | 9 | ||||
-rw-r--r-- | common/translation.cpp | 2 |
7 files changed, 1 insertions, 20 deletions
diff --git a/common/archive.cpp b/common/archive.cpp index 5a339900b6..07d363a9a8 100644 --- a/common/archive.cpp +++ b/common/archive.cpp @@ -284,6 +284,4 @@ void SearchManager::clear() { addDirectory(".", ".", -2); } -DECLARE_SINGLETON(SearchManager); - } // namespace Common diff --git a/common/config-manager.cpp b/common/config-manager.cpp index fdd0c6f033..91ba3c867b 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -36,8 +36,6 @@ static bool isValidDomainName(const Common::String &domName) { namespace Common { -DECLARE_SINGLETON(ConfigManager); - char const *const ConfigManager::kApplicationDomain = "scummvm"; char const *const ConfigManager::kTransientDomain = "__TRANSIENT"; diff --git a/common/coroutines.cpp b/common/coroutines.cpp index 248777febd..54e53ff7d3 100644 --- a/common/coroutines.cpp +++ b/common/coroutines.cpp @@ -33,8 +33,6 @@ namespace Common { /** Helper null context instance */ CoroContext nullContext = NULL; -DECLARE_SINGLETON(CoroutineScheduler); - #ifdef COROUTINE_DEBUG namespace { /** Count of active coroutines */ diff --git a/common/debug.cpp b/common/debug.cpp index 5db8990db8..94517afab6 100644 --- a/common/debug.cpp +++ b/common/debug.cpp @@ -34,8 +34,6 @@ bool gDebugChannelsOnly = false; namespace Common { -DECLARE_SINGLETON(DebugManager); - namespace { struct DebugLevelComperator { diff --git a/common/osd_message_queue.cpp b/common/osd_message_queue.cpp index b8abf18bb5..3355295bbe 100644 --- a/common/osd_message_queue.cpp +++ b/common/osd_message_queue.cpp @@ -24,8 +24,6 @@ #include "common/system.h" namespace Common { - -DECLARE_SINGLETON(OSDMessageQueue); OSDMessageQueue::OSDMessageQueue() : _lastUpdate(0) { } diff --git a/common/singleton.h b/common/singleton.h index 9bcd590183..6c36d7a37d 100644 --- a/common/singleton.h +++ b/common/singleton.h @@ -88,14 +88,7 @@ protected: static T *_singleton; }; -/** - * Note that you need to use this macro from the Common namespace. - * - * This is because C++ requires initial explicit specialization - * to be placed in the same namespace as the template. - */ -#define DECLARE_SINGLETON(T) \ - template<> T *Singleton<T>::_singleton = 0 +template<class T> T *Singleton<T>::_singleton = 0; } // End of namespace Common diff --git a/common/translation.cpp b/common/translation.cpp index 01665bf876..04df9d213d 100644 --- a/common/translation.cpp +++ b/common/translation.cpp @@ -40,8 +40,6 @@ namespace Common { -DECLARE_SINGLETON(TranslationManager); - bool operator<(const TLanguage &l, const TLanguage &r) { return strcmp(l.name, r.name) < 0; } |