Browse Source

Inline unary LoadCache.

Stephen Kelly 10 years ago
parent
commit
a02e53eb94
3 changed files with 2 additions and 8 deletions
  1. 0 6
      Source/cmCacheManager.cxx
  2. 0 1
      Source/cmCacheManager.h
  3. 2 1
      Source/cmake.cxx

+ 0 - 6
Source/cmCacheManager.cxx

@@ -28,12 +28,6 @@ cmCacheManager::cmCacheManager(cmake* cm)
   this->CMakeInstance = cm;
 }
 
-bool cmCacheManager::LoadCache(const std::string& path)
-{
-  std::set<std::string> emptySet;
-  return this->LoadCache(path, true, emptySet, emptySet);
-}
-
 static bool ParseEntryWithoutType(const std::string& entry,
                                   std::string& var,
                                   std::string& value)

+ 0 - 1
Source/cmCacheManager.h

@@ -99,7 +99,6 @@ public:
     }
 
   ///! Load a cache for given makefile.  Loads from path/CMakeCache.txt.
-  bool LoadCache(const std::string& path);
   bool LoadCache(const std::string& path, bool internal,
                  std::set<std::string>& excludes,
                  std::set<std::string>& includes);

+ 2 - 1
Source/cmake.cxx

@@ -1752,7 +1752,8 @@ int cmake::LoadCache()
 
 bool cmake::LoadCache(const std::string& path)
 {
-  return this->CacheManager->LoadCache(path);
+  std::set<std::string> emptySet;
+  return this->LoadCache(path, true, emptySet, emptySet);
 }
 
 bool cmake::LoadCache(const std::string& path, bool internal,