浏览代码

cmCTestScriptHandler: Simplify deletes.

Deleting a nullptr is fine.
Stephen Kelly 10 年之前
父节点
当前提交
2f2d4da9dd
共有 1 个文件被更改,包括 9 次插入26 次删除
  1. 9 26
      Source/CTest/cmCTestScriptHandler.cxx

+ 9 - 26
Source/CTest/cmCTestScriptHandler.cxx

@@ -126,20 +126,14 @@ void cmCTestScriptHandler::Initialize()
   this->ScriptStartTime = 0;
   this->ScriptStartTime = 0;
 
 
   this->Makefile = 0;
   this->Makefile = 0;
-  if (this->LocalGenerator)
-    {
-    delete this->LocalGenerator;
-    }
+
+  delete this->LocalGenerator;
   this->LocalGenerator = 0;
   this->LocalGenerator = 0;
-  if (this->GlobalGenerator)
-    {
-    delete this->GlobalGenerator;
-    }
+
+  delete this->GlobalGenerator;
   this->GlobalGenerator = 0;
   this->GlobalGenerator = 0;
-  if (this->CMake)
-    {
-    delete this->CMake;
-    }
+
+  delete this->CMake;
 }
 }
 
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
@@ -147,20 +141,9 @@ cmCTestScriptHandler::~cmCTestScriptHandler()
 {
 {
   // local generator owns the makefile
   // local generator owns the makefile
   this->Makefile = 0;
   this->Makefile = 0;
-  if (this->LocalGenerator)
-    {
-    delete this->LocalGenerator;
-    }
-  this->LocalGenerator = 0;
-  if (this->GlobalGenerator)
-    {
-    delete this->GlobalGenerator;
-    }
-  this->GlobalGenerator = 0;
-  if (this->CMake)
-    {
-    delete this->CMake;
-    }
+  delete this->LocalGenerator;
+  delete this->GlobalGenerator;
+  delete this->CMake;
 }
 }