diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2014-08-09 22:45:07 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2014-08-09 22:45:07 +0200 |
| commit | ac019c263d7b41742934a9dafd58ac2e6171109c (patch) | |
| tree | d5bdab624eac1a92925e6abcaf82c868485f202b /src/common | |
| parent | ea0615ee05b0812f2bb5d7d8b970b3f83999a319 (diff) | |
| download | colobot-ac019c263d7b41742934a9dafd58ac2e6171109c.tar.gz colobot-ac019c263d7b41742934a9dafd58ac2e6171109c.tar.bz2 colobot-ac019c263d7b41742934a9dafd58ac2e6171109c.zip | |
Remove unnecessary delete checks (#318)
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/iman.cpp | 4 | ||||
| -rw-r--r-- | src/common/singleton.h | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/common/iman.cpp b/src/common/iman.cpp index 88fbb9b..edfa9c7 100644 --- a/src/common/iman.cpp +++ b/src/common/iman.cpp @@ -42,9 +42,7 @@ void CInstanceManager::Flush() { for (int i = 0; i < CLASS_MAX; i++) { - if (m_table[i].instances != nullptr) - delete[] m_table[i].instances; - + delete[] m_table[i].instances; m_table[i].instances = nullptr; } } diff --git a/src/common/singleton.h b/src/common/singleton.h index 841759d..bf5bc9d 100644 --- a/src/common/singleton.h +++ b/src/common/singleton.h @@ -62,10 +62,7 @@ public: static void ReplaceInstance(T* newInstance) { assert(newInstance != nullptr); - - if (m_instance != nullptr) - delete m_instance; - + delete m_instance; m_instance = newInstance; } #endif |