diff options
author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-06-27 20:44:16 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-06-28 13:02:26 (GMT) |
commit | 1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb (patch) | |
tree | 3c13e63f2529d877b865475b5269a96ef5e0a4cb /Source/cmCacheManager.cxx | |
parent | b4b73f56a26c1e1d630e3f262d2d4bafee8231c4 (diff) | |
download | CMake-1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb.zip CMake-1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb.tar.gz CMake-1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb.tar.bz2 |
use CM_NULLPTR
Diffstat (limited to 'Source/cmCacheManager.cxx')
-rw-r--r-- | Source/cmCacheManager.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index bcef3c8..bdd7303 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -179,7 +179,7 @@ bool cmCacheManager::LoadCache(const std::string& path, bool internal, } const char* cmCacheManager::PersistentProperties[] = { "ADVANCED", "MODIFIED", - "STRINGS", 0 }; + "STRINGS", CM_NULLPTR }; bool cmCacheManager::ReadPropertyEntry(std::string const& entryKey, CacheEntry& e) @@ -447,7 +447,7 @@ cmCacheManager::CacheEntry* cmCacheManager::GetCacheEntry( if (i != this->Cache.end()) { return &i->second; } - return 0; + return CM_NULLPTR; } cmCacheManager::CacheIterator cmCacheManager::GetCacheIterator(const char* key) @@ -462,7 +462,7 @@ const char* cmCacheManager::GetInitializedCacheValue( if (i != this->Cache.end() && i->second.Initialized) { return i->second.Value.c_str(); } - return 0; + return CM_NULLPTR; } void cmCacheManager::PrintCache(std::ostream& out) const @@ -616,7 +616,7 @@ const char* cmCacheManager::CacheIterator::GetProperty( if (!this->IsAtEnd()) { return this->GetEntry().GetProperty(prop); } - return 0; + return CM_NULLPTR; } void cmCacheManager::CacheIterator::SetProperty(const std::string& p, @@ -653,5 +653,5 @@ void cmCacheManager::CacheIterator::SetProperty(const std::string& p, bool v) bool cmCacheManager::CacheIterator::PropertyExists( const std::string& prop) const { - return this->GetProperty(prop) != NULL; + return this->GetProperty(prop) != CM_NULLPTR; } |