removed unecssary null ptr checks + changed NULL to nullptr

OGRECave · Jan 7, 2024 · ee5fd3b · ee5fd3b
1 parent bdc6bd2
commit ee5fd3b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/RenderSystems/Direct3D11/include/OgreD3D11Prerequisites.h b/RenderSystems/Direct3D11/include/OgreD3D11Prerequisites.h
@@ -52,9 +52,9 @@ THE SOFTWARE.
 }
 
 // some D3D commonly used macros
-#define SAFE_DELETE(p)       { if(p) { delete (p);     (p)=NULL; } }
-#define SAFE_DELETE_ARRAY(p) { if(p) { delete[] (p);   (p)=NULL; } }
-#define SAFE_RELEASE(p)      { if(p) { (p)->Release(); (p)=NULL; } }
+#define SAFE_DELETE(p)       { (p)=nullptr; }
+#define SAFE_DELETE_ARRAY(p) { (p)=nullptr; }
+#define SAFE_RELEASE(p)      { if(p) { (p)->Release(); (p)=nullptr; } }
 
 #if defined(_WIN32_WINNT_WIN8) // Win8 SDK required to compile, will work on Windows 8 and Platform Update for Windows 7
 #define OGRE_D3D11_PROFILING 1

diff --git a/Tools/LightwaveConverter/include/lwEnvelope.h b/Tools/LightwaveConverter/include/lwEnvelope.h
@@ -45,12 +45,12 @@ class lwEnvelope
 public:
     lwEnvelope()
     {
-        name = 0;
+        name = nullptr;
     }
 
     ~lwEnvelope()
     {
-        if (name) free(name);
+        delete[] name;
         unsigned int i;
         for (i=0; i<keys.size(); delete keys[i++]);
         for (i=0; i<cfilters.size(); delete cfilters[i++]);

diff --git a/Tools/MayaExport/include/materialSet.h b/Tools/MayaExport/include/materialSet.h
@@ -41,8 +41,7 @@ namespace OgreMayaExporter
         //destructor
         ~MaterialSet(){
             clear();
-            if (m_pDefaultMat)
-                delete m_pDefaultMat;
+            delete m_pDefaultMat;
         }
         //clear
         void clear(){