eden-emu/Catch2
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use CATCH_NULL instead of NULL

Browse source 
- expands to nullptr if CATCH_CONFIG_CPP11_NULLPTR is defined (see #444)
This commit is contained in:
Phil Nash 2015-07-01 07:33:27 +01:00
parent 3b18d9e962
commit 805de43a3d
25 changed files with 112 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/internal/catch_registry_hub.hpp
View file

@ -55,7 +55,7 @@ namespace Catch {
// Single, global, instance
inline RegistryHub*& getTheRegistryHub() {
static RegistryHub* theRegistryHub = NULL;
static RegistryHub* theRegistryHub = CATCH_NULL;
if( !theRegistryHub )
theRegistryHub = new RegistryHub();
return theRegistryHub;
@ -70,7 +70,7 @@ namespace Catch {
}
void cleanUp() {
delete getTheRegistryHub();
getTheRegistryHub() = NULL;
getTheRegistryHub() = CATCH_NULL;
cleanUpContext();
}
std::string translateActiveException() {