Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Safe delete pointers in KWSys ClassFinalize #1260

Merged
merged 3 commits into from
Mar 7, 2019
Merged

Safe delete pointers in KWSys ClassFinalize #1260

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1d7176
Safe delete pointers in ClassFinalize
williamfgc Mar 7, 2019
7381d9e
Replacing reference with pointer
williamfgc Mar 7, 2019
0cc6c4c
Replacing void with template function
williamfgc Mar 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions thirdparty/KWSys/adios2sys/SystemTools.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4666,15 +4666,28 @@ void SystemTools::ClassInitialize()
#endif
}

namespace {

template <class T>
void SafeDelete(T*& pointer)
{
if (pointer != nullptr) {
delete pointer;
pointer = nullptr;
}
}

} // end empty namespace

void SystemTools::ClassFinalize()
{
delete SystemTools::TranslationMap;
SafeDelete(SystemTools::TranslationMap);
#ifdef _WIN32
delete SystemTools::PathCaseMap;
delete SystemTools::EnvMap;
SafeDelete(SystemTools::PathCaseMap);
SafeDelete(SystemTools::EnvMap);
#endif
#ifdef __CYGWIN__
delete SystemTools::Cyg2Win32Map;
SafeDelete(SystemTools::Cyg2Win32Map);
#endif
}

Expand Down