From a02e53eb947b61dd25ecd139a213d4062fbc5b62 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Sat, 10 Oct 2015 15:13:08 +0200
Subject: [PATCH] Inline unary LoadCache.

---
 Source/cmCacheManager.cxx | 6 ------
 Source/cmCacheManager.h   | 1 -
 Source/cmake.cxx          | 3 ++-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index a7777d9a7..9dac27b1c 100644
--- a/Source/cmCacheManager.cxx
+++ b/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)
diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h
index b779ba37b..76533b52d 100644
--- a/Source/cmCacheManager.h
+++ b/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);
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 8016e4119..ad5f6b784 100644
--- a/Source/cmake.cxx
+++ b/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,