Merge pull request #1110 from elfring/Remove_unnecessary_null_pointer…

…_checks Remove unnecessary null pointer checks.
STEllAR-GROUP · Apr 7, 2014 · cd7d32f · cd7d32f
2 parents 8e90b77 + 6291c18
commit cd7d32f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/hpx/util/coroutine/detail/context_base.hpp b/hpx/util/coroutine/detail/context_base.hpp
@@ -177,8 +177,7 @@ namespace hpx { namespace util { namespace coroutines { namespace detail
       m_phase = 0;
 #endif
 #if HPX_THREAD_MAINTAIN_THREAD_DATA
-      if (m_thread_data)
-        delete_tss_storage(m_thread_data);
+      delete_tss_storage(m_thread_data);
 #endif
     }
 

diff --git a/hpx/util/merging_map.hpp b/hpx/util/merging_map.hpp
@@ -207,11 +207,8 @@ struct merging_map : boost::noncopyable
             pointer p
             ) const
         {
-            if (p)
-            {
-                delete p;
-                p = 0;
-            }
+            delete p;
+            p = 0;
         }
     };
 

diff --git a/hpx/util/thread_specific_ptr.hpp b/hpx/util/thread_specific_ptr.hpp
@@ -62,9 +62,7 @@ namespace hpx { namespace util
             T* new_value = 0
             )
         {
-            if (0 != ptr_) //-V809
-                delete ptr_;
-
+            delete ptr_;
             ptr_ = new_value;
         }