Merge pull request #2862 from hedaoyuan/fix_14

Remove useless empty pointer check.

paddle/api/ConfigParser.cpp

@@ -64,11 +64,7 @@ ModelConfig* TrainerConfig::getModelConfig() const {
 
 ParameterConfig::ParameterConfig() : m(new ParameterConfigPrivate()) {}
 
-ParameterConfig::~ParameterConfig() {
+ParameterConfig::~ParameterConfig() { delete m; }
-  if (m) {
-    delete m;
-  }
-}
 
 ParameterConfig* ParameterConfig::createParameterConfigFromParameterSharedPtr(
     void* ptr) {
@@ -98,11 +94,7 @@ void* ParameterConfig::getRawPtr() { return m->getConfigPtr(); }
 
 OptimizationConfig::OptimizationConfig() : m(new OptimizationConfigPrivate()) {}
 
-OptimizationConfig::~OptimizationConfig() {
+OptimizationConfig::~OptimizationConfig() { delete m; }
-  if (m) {
-    delete m;
-  }
-}
 
 std::string OptimizationConfig::toProtoString() {
   return m->getConfig().SerializeAsString();

paddle/api/ParameterOptimizer.cpp

@@ -53,11 +53,7 @@ struct ParameterTraverseCallbackPrivate {
 
 ParameterOptimizer::ParameterOptimizer() : m(new ParameterOptimizerPrivate()) {}
 
-ParameterOptimizer::~ParameterOptimizer() {
+ParameterOptimizer::~ParameterOptimizer() { delete m; }
-  if (m) {
-    delete m;
-  }
-}
 
 ParameterOptimizer* ParameterOptimizer::create(OptimizationConfig* config) {
   CHECK(config != nullptr);
@@ -104,11 +100,7 @@ std::vector<int> ParameterOptimizer::getParameterTypes() const {
 ParameterTraverseCallback::ParameterTraverseCallback()
     : m(new ParameterTraverseCallbackPrivate()) {}
 
-ParameterTraverseCallback::~ParameterTraverseCallback() {
+ParameterTraverseCallback::~ParameterTraverseCallback() { delete m; }
-  if (m) {
-    delete m;
-  }
-}
 
 void ParameterTraverseCallback::apply(const std::vector<Vector*>& vecs,
                                       const ParameterConfig& conf,

paddle/api/Vector.cpp

@@ -171,11 +171,7 @@ struct VectorPrivate {
 
 Vector::Vector() : m(new VectorPrivate()) {}
 
-Vector::~Vector() {
+Vector::~Vector() { delete m; }
-  if (m) {
-    delete m;
-  }
-}
 
 Vector* Vector::createZero(size_t sz, bool useGpu) {
   auto retVec = new Vector();

paddle/gserver/dataproviders/DataProvider.h

@@ -205,10 +205,8 @@ public:
       hl_destroy_event(hlEvent_);
       hlEvent_ = NULL;
     }
-    if (batchData_) {
+    delete batchData_;
-      delete batchData_;
+    batchData_ = NULL;
-      batchData_ = NULL;
-    }
   }
 
   void setDataBatch(DataBatch* batchData) { batchData_ = batchData; }

paddle/math/Storage.cpp

@@ -32,9 +32,7 @@ static InitFunction __init_storage_engine([]() { StorageEngine::singleton(); },
 StorageEngine::StorageEngine() : cpuAllocator_(nullptr) {}
 
 StorageEngine::~StorageEngine() {
-  if (cpuAllocator_) {
+  delete cpuAllocator_;
-    delete cpuAllocator_;
-  }
   for (auto it : gpuAllocator_) {
     delete it;
   }

paddle/trainer/TrainerConfigHelper.cpp

@@ -62,11 +62,7 @@ TrainerConfigHelper::TrainerConfigHelper(const TrainerConfig &config)
   m->conf = config;
 }
 
-TrainerConfigHelper::~TrainerConfigHelper() {
+TrainerConfigHelper::~TrainerConfigHelper() { delete m; }
-  if (m) {
-    delete m;
-  }
-}
 
 const TrainerConfig &TrainerConfigHelper::getConfig() const { return m->conf; }