Fix issue#10: removed unnecessary null pointer checks
authorkhizmax <khizmax@gmail.com>
Thu, 22 Jan 2015 11:32:53 +0000 (14:32 +0300)
committerkhizmax <khizmax@gmail.com>
Thu, 22 Jan 2015 11:32:53 +0000 (14:32 +0300)
src/dhp_gc.cpp
tests/cppunit/thread.cpp

index 375fb8b794d7ee7e8c6c1b611c7931fc5450e34c..ea41aa14fac9604bc73d1395b863f75cbbcf4a30 100644 (file)
@@ -147,10 +147,8 @@ namespace cds { namespace gc { namespace dhp {
 
     void CDS_STDCALL GarbageCollector::Destruct()
     {
-        if ( m_pManager ) {
-            delete m_pManager;
-            m_pManager = nullptr;
-        }
+        delete m_pManager;
+        m_pManager = nullptr;
     }
 
     GarbageCollector::GarbageCollector( size_t nLiberateThreshold, size_t nInitialThreadGuardCount )
index af15fa9324cb65f934c13358696ef5ec930913c6..a50aa37087773a6a20bf0d37cfe8ce2a6d88ccb7 100644 (file)
@@ -42,10 +42,8 @@ namespace CppUnitMini {
 
     ThreadPool::~ThreadPool()
     {
-        if ( m_pBarrierStart )
-            delete m_pBarrierStart;
-        if ( m_pBarrierDone )
-            delete m_pBarrierDone;
+        delete m_pBarrierStart;
+        delete m_pBarrierDone;
 
         for ( size_t i = 0; i < m_arrThreads.size(); ++i )
             delete m_arrThreads[i];