From ba404938a202b51bb82bff8692ed08e53b061ad4 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 5 Apr 2015 10:48:04 +0200 Subject: cmCacheManager: Port consumers to non-iterator API. This simplifies reasoning about the follow-up commit which ports away from cmCacheManager to a class with the same method names. --- Source/cmSetCommand.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Source/cmSetCommand.cxx') diff --git a/Source/cmSetCommand.cxx b/Source/cmSetCommand.cxx index 204d95b1e8..e17474bd60 100644 --- a/Source/cmSetCommand.cxx +++ b/Source/cmSetCommand.cxx @@ -136,9 +136,10 @@ bool cmSetCommand } // see if this is already in the cache - cmCacheManager::CacheIterator it = - this->Makefile->GetCacheManager()->GetCacheIterator(variable); - if(!it.IsAtEnd() && (it.GetType() != cmCacheManager::UNINITIALIZED)) + cmCacheManager* manager = this->Makefile->GetCacheManager(); + const char* existingValue = manager->GetCacheEntryValue(variable); + if(existingValue && + (manager->GetCacheEntryType(variable) != cmCacheManager::UNINITIALIZED)) { // if the set is trying to CACHE the value but the value // is already in the cache and the type is not internal -- cgit v1.2.1