From 4c2a26247886fd6b0baaef37d57b6c4ad78bf42b Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Fri, 22 Dec 2017 19:35:55 -1000 Subject: [PATCH] Removed redundant NDEBUGs --- include/amuse/Entity.hpp | 4 ---- lib/Engine.cpp | 4 ---- lib/Studio.cpp | 2 -- 3 files changed, 10 deletions(-) diff --git a/include/amuse/Entity.hpp b/include/amuse/Entity.hpp index 917d424..4f81055 100644 --- a/include/amuse/Entity.hpp +++ b/include/amuse/Entity.hpp @@ -26,9 +26,7 @@ protected: bool m_destroyed = false; void _destroy() { -#ifndef NDEBUG assert(!m_destroyed); -#endif m_destroyed = true; } Engine& m_engine; @@ -42,10 +40,8 @@ public: } ~Entity() { -#ifndef NDEBUG /* Ensure proper destruction procedure followed */ assert(m_destroyed); -#endif } Engine& getEngine() { return m_engine; } diff --git a/lib/Engine.cpp b/lib/Engine.cpp index 8590a3b..e7145f7 100644 --- a/lib/Engine.cpp +++ b/lib/Engine.cpp @@ -103,9 +103,7 @@ std::shared_ptr Engine::_allocateStudio(bool mainOut) std::list>::iterator Engine::_destroyVoice(std::list>::iterator it) { -#ifndef NDEBUG assert(this == &(*it)->getEngine()); -#endif if ((*it)->m_destroyed) return m_activeVoices.begin(); (*it)->_destroy(); @@ -115,9 +113,7 @@ std::list>::iterator Engine::_destroyVoice(std::list>::iterator Engine::_destroySequencer(std::list>::iterator it) { -#ifndef NDEBUG assert(this == &(*it)->getEngine()); -#endif if ((*it)->m_destroyed) return m_activeSequencers.begin(); (*it)->_destroy(); diff --git a/lib/Studio.cpp b/lib/Studio.cpp index 461cd9e..eba881b 100644 --- a/lib/Studio.cpp +++ b/lib/Studio.cpp @@ -27,10 +27,8 @@ void Studio::addStudioSend(std::weak_ptr studio, float dry, float auxA, { m_studiosOut.emplace_back(studio, dry, auxA, auxB); -#ifndef NDEBUG /* Cyclic check */ assert(!_cyclicCheck(this)); -#endif } void Studio::resetOutputSampleRate(double sampleRate)