Replacing void with template function

ornladios · Mar 7, 2019 · 86794f6 · 86794f6
1 parent 7381d9e
commit 86794f6
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/thirdparty/KWSys/adios2sys/SystemTools.cxx b/thirdparty/KWSys/adios2sys/SystemTools.cxx
@@ -4666,22 +4666,28 @@ void SystemTools::ClassInitialize()
 #endif
 }
 
-void SystemTools::ClassFinalize()
+namespace {
+
+template <class T>
+void SafeDelete(T*& pointer)
 {
-  auto lf_Delete = [](void** pointer) {
-    if (*pointer != nullptr) {
-      delete *pointer;
-      *pointer = nullptr;
-    }
-  };
+  if (pointer != nullptr) {
+    delete pointer;
+    pointer = nullptr;
+  }
+}
+
+} // end empty namespace
 
-  lf_Delete(SystemTools::TranslationMap);
+void SystemTools::ClassFinalize()
+{
+  SafeDelete(SystemTools::TranslationMap);
 #ifdef _WIN32
-  lf_Delete(SystemTools::PathCaseMap);
-  lf_Delete(SystemTools::EnvMap);
+  SafeDelete(SystemTools::PathCaseMap);
+  SafeDelete(SystemTools::EnvMap);
 #endif
 #ifdef __CYGWIN__
-  lf_Delete(SystemTools::Cyg2Win32Map);
+  SafeDelete(SystemTools::Cyg2Win32Map);
 #endif
 }