diff options
| author | erihel <erihel@gmail.com> | 2012-08-09 23:04:29 +0200 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2012-08-09 23:04:29 +0200 |
| commit | 9946459c0cd65c3b66719a2aefc42c7ab2a29c04 (patch) | |
| tree | 78e68a3a434082c5f42926f907adb05db9ae24dd /src/common/iman.cpp | |
| parent | f1d1cdceee3ec49546ba800a1b53a2dfb9c21e11 (diff) | |
| download | colobot-9946459c0cd65c3b66719a2aefc42c7ab2a29c04.tar.gz colobot-9946459c0cd65c3b66719a2aefc42c7ab2a29c04.tar.bz2 colobot-9946459c0cd65c3b66719a2aefc42c7ab2a29c04.zip | |
* changed 0, NULL to nullptr
* changed profile.cpp to use SimpleIni to load config files
* added new CProfile singleton class for loading config
* added SimpleIni to lib/ dir
* added config loading tests
Diffstat (limited to 'src/common/iman.cpp')
| -rw-r--r-- | src/common/iman.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/iman.cpp b/src/common/iman.cpp index 4c70cde..4b89ecf 100644 --- a/src/common/iman.cpp +++ b/src/common/iman.cpp @@ -23,7 +23,7 @@ #include "common/iman.h" -template<> CInstanceManager* CSingleton<CInstanceManager>::mInstance = 0; +template<> CInstanceManager* CSingleton<CInstanceManager>::mInstance = nullptr; CInstanceManager& CInstanceManager::GetInstance() |