From 59d615c8d2c1256b051598fe374a5737bf38351a Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Fri, 12 Apr 2013 23:06:45 +0000
Subject: [PATCH] Removed the useless SAFE_DELETE macro

---
 include/cantera/base/mdp_allo.h       |  9 ---------
 src/numerics/BEulerInt.cpp            |  5 +----
 src/transport/LiquidTransportData.cpp | 21 ++++++++-------------
 src/transport/SimpleTransport.cpp     | 14 ++++----------
 src/transport/SolidTransportData.cpp  | 15 +++++----------
 5 files changed, 18 insertions(+), 46 deletions(-)

diff --git a/include/cantera/base/mdp_allo.h b/include/cantera/base/mdp_allo.h
index fdd789336..39ac1d5fe 100644
--- a/include/cantera/base/mdp_allo.h
+++ b/include/cantera/base/mdp_allo.h
@@ -120,15 +120,6 @@ extern int MDP_MP_Nprocs;
 extern int MDP_MP_myproc;
 #endif
 
-/****************************************************************************/
-/*
- * MDP_SAFE_DELETE()
- *       This useful define is great for delete single instances of
- *       mallocing using new.
- */
-#define MDP_SAFE_DELETE(a) if (a) { delete (a); a = 0; }
-
-
 /****************************************************************************/
 
 #define mdp_alloc_struct(x, num) (x *) mdp_array_alloc(1, (num), sizeof(x))
diff --git a/src/numerics/BEulerInt.cpp b/src/numerics/BEulerInt.cpp
index 618a93256..28e781c43 100644
--- a/src/numerics/BEulerInt.cpp
+++ b/src/numerics/BEulerInt.cpp
@@ -18,9 +18,6 @@
 using namespace std;
 using namespace mdp;
 
-#define SAFE_DELETE(a) if (a) { delete (a); a = 0; }
-
-
 /*
  * Blas routines
  */
@@ -121,7 +118,7 @@ BEulerInt::~BEulerInt()
     mdp::mdp_safe_free((void**) &m_abstol);
     mdp::mdp_safe_free((void**) &m_rowScales);
     mdp::mdp_safe_free((void**) &m_colScales);
-    SAFE_DELETE(tdjac_ptr);
+    delete tdjac_ptr;
 }
 //================================================================================================
 void BEulerInt::setTolerances(double reltol, size_t n, double* abstol)
diff --git a/src/transport/LiquidTransportData.cpp b/src/transport/LiquidTransportData.cpp
index b4c3ad2ad..3d6081c66 100644
--- a/src/transport/LiquidTransportData.cpp
+++ b/src/transport/LiquidTransportData.cpp
@@ -6,9 +6,6 @@
 #include "cantera/transport/LiquidTransportData.h"
 using namespace std;
 
-#ifndef SAFE_DELETE
-#define SAFE_DELETE(x)  if (x) { delete (x); x = 0; }
-#endif
 namespace Cantera
 {
 
@@ -87,26 +84,24 @@ LiquidTransportData& LiquidTransportData::operator=(const LiquidTransportData& r
 //====================================================================================================================
 LiquidTransportData::~LiquidTransportData()
 {
-
-    SAFE_DELETE(hydroRadius);
-    SAFE_DELETE(viscosity);
-    SAFE_DELETE(ionConductivity);
+    delete hydroRadius;
+    delete viscosity;
+    delete ionConductivity;
 
     for (size_t k = 0; k < mobilityRatio.size(); k++) {
         if (mobilityRatio[k]) {
-            SAFE_DELETE(mobilityRatio[k]);
+            delete mobilityRatio[k];
         }
     }
     for (size_t k = 0; k < selfDiffusion.size(); k++) {
         if (selfDiffusion[k]) {
-            SAFE_DELETE(selfDiffusion[k]);
+            delete selfDiffusion[k];
         }
     }
 
-    SAFE_DELETE(thermalCond);
-    SAFE_DELETE(electCond);
-    SAFE_DELETE(speciesDiffusivity);
-
+    delete thermalCond;
+    delete electCond;
+    delete speciesDiffusivity;
 }
 //====================================================================================================================
 }
diff --git a/src/transport/SimpleTransport.cpp b/src/transport/SimpleTransport.cpp
index f0fb89f5d..fa42904a9 100644
--- a/src/transport/SimpleTransport.cpp
+++ b/src/transport/SimpleTransport.cpp
@@ -14,12 +14,6 @@
 #include <iostream>
 using namespace std;
 
-#ifndef SAFE_DELETE
-//! \cond
-#define SAFE_DELETE(x)  if (x) { delete (x); x = 0; }
-//! \endcond
-#endif
-
 namespace Cantera
 {
 //================================================================================================
@@ -151,16 +145,16 @@ Transport* SimpleTransport::duplMyselfAsTransport() const
 SimpleTransport::~SimpleTransport()
 {
     for (size_t k = 0; k < m_coeffVisc_Ns.size() ; k++) {
-        SAFE_DELETE(m_coeffVisc_Ns[k]);
+        delete m_coeffVisc_Ns[k];
     }
     for (size_t k = 0; k < m_coeffLambda_Ns.size(); k++) {
-        SAFE_DELETE(m_coeffLambda_Ns[k]);
+        delete m_coeffLambda_Ns[k];
     }
     for (size_t k = 0; k < m_coeffDiff_Ns.size(); k++) {
-        SAFE_DELETE(m_coeffDiff_Ns[k]);
+        delete m_coeffDiff_Ns[k];
     }
     for (size_t k = 0; k < m_coeffHydroRadius_Ns.size(); k++) {
-        SAFE_DELETE(m_coeffHydroRadius_Ns[k]);
+        delete m_coeffHydroRadius_Ns[k];
     }
 }
 //================================================================================================
diff --git a/src/transport/SolidTransportData.cpp b/src/transport/SolidTransportData.cpp
index a89e02338..4bce9444b 100644
--- a/src/transport/SolidTransportData.cpp
+++ b/src/transport/SolidTransportData.cpp
@@ -12,9 +12,6 @@
 
 using namespace std;
 
-#ifndef SAFE_DELETE
-#define SAFE_DELETE(x)  if (x) { delete (x); x = 0; }
-#endif
 namespace Cantera
 {
 
@@ -70,13 +67,11 @@ SolidTransportData& SolidTransportData::operator=(const SolidTransportData& righ
 //====================================================================================================================
 SolidTransportData::~SolidTransportData()
 {
-
-    SAFE_DELETE(ionConductivity);
-    SAFE_DELETE(thermalConductivity);
-    SAFE_DELETE(electConductivity);
-    SAFE_DELETE(defectDiffusivity);
-    SAFE_DELETE(defectActivity);
-
+    delete ionConductivity;
+    delete thermalConductivity;
+    delete electConductivity;
+    delete defectDiffusivity;
+    delete defectActivity;
 }
 //====================================================================================================================
 }