[colobot] 95/100: Remove unnecessary m_instance declarations

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit 02aa281d305dbc106f7044e97e6bc3ae0aeae9eb
Author: krzys-h <krzys_h at interia.pl>
Date:   Wed May 24 13:59:20 2017 +0200

    Remove unnecessary m_instance declarations
    
    They don't do anything at all in gcc and clang, but cause compile errors in MSVC
    see #955
---
 src/app/app.h                | 2 --
 src/app/input.h              | 2 --
 src/app/pathman.h            | 2 --
 src/common/config_file.h     | 2 --
 src/common/logger.h          | 2 --
 src/common/settings.h        | 2 --
 src/graphics/engine/engine.h | 2 --
 src/level/robotmain.h        | 2 --
 src/object/object_manager.h  | 2 --
 9 files changed, 18 deletions(-)

diff --git a/src/app/app.h b/src/app/app.h
index ac8769c..20721e2 100644
--- a/src/app/app.h
+++ b/src/app/app.h
@@ -407,5 +407,3 @@ protected:
 
     std::map<int, bool> m_textInputEnabled;
 };
-
-template<> CApplication* CSingleton<CApplication>::m_instance;
diff --git a/src/app/input.h b/src/app/input.h
index 2b8617e..15cdc98 100644
--- a/src/app/input.h
+++ b/src/app/input.h
@@ -161,5 +161,3 @@ private:
 
     std::map<InputSlot, std::string> m_keyTable;
 };
-
-template<> CInput* CSingleton<CInput>::m_instance;
diff --git a/src/app/pathman.h b/src/app/pathman.h
index 87fa449..059c81f 100644
--- a/src/app/pathman.h
+++ b/src/app/pathman.h
@@ -67,5 +67,3 @@ private:
     //! Save path
     std::string m_savePath;
 };
-
-template<> CPathManager* CSingleton<CPathManager>::m_instance;
diff --git a/src/common/config_file.h b/src/common/config_file.h
index 9acc5ae..0ed8e19 100644
--- a/src/common/config_file.h
+++ b/src/common/config_file.h
@@ -112,5 +112,3 @@ inline CConfigFile & GetConfigFile()
 {
     return CConfigFile::GetInstance();
 }
-
-template<> CConfigFile* CSingleton<CConfigFile>::m_instance;
diff --git a/src/common/logger.h b/src/common/logger.h
index e49fbd3..e0a935d 100644
--- a/src/common/logger.h
+++ b/src/common/logger.h
@@ -136,5 +136,3 @@ inline CLogger* GetLogger()
 {
     return CLogger::GetInstancePointer();
 }
-
-template<> CLogger* CSingleton<CLogger>::m_instance;
diff --git a/src/common/settings.h b/src/common/settings.h
index cb23660..4e9b762 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -105,5 +105,3 @@ protected:
 
     Language m_language;
 };
-
-template<> CSettings* CSingleton<CSettings>::m_instance;
diff --git a/src/graphics/engine/engine.h b/src/graphics/engine/engine.h
index 687bbaf..834de1e 100644
--- a/src/graphics/engine/engine.h
+++ b/src/graphics/engine/engine.h
@@ -1490,5 +1490,3 @@ protected:
 
 
 } // namespace Gfx
-
-template<> Gfx::CEngine* CSingleton<Gfx::CEngine>::m_instance;
diff --git a/src/level/robotmain.h b/src/level/robotmain.h
index d4e1852..fee753f 100644
--- a/src/level/robotmain.h
+++ b/src/level/robotmain.h
@@ -716,5 +716,3 @@ protected:
     //! Index of currently selected element in command history
     int             m_commandHistoryIndex;
 };
-
-template<> CRobotMain* CSingleton<CRobotMain>::m_instance;
diff --git a/src/object/object_manager.h b/src/object/object_manager.h
index 2a02d24..73ae001 100644
--- a/src/object/object_manager.h
+++ b/src/object/object_manager.h
@@ -311,5 +311,3 @@ private:
     int m_activeObjectIterators;
     bool m_shouldCleanRemovedObjects;
 };
-
-template<> CObjectManager* CSingleton<CObjectManager>::m_instance;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git