From f71fdf0ec8289ada5b32b784bc2f6f617538ce0b Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 7 Apr 2015 22:36:13 +0200 Subject: cmMakefile: Remove unused CacheManager accessor. Remove unneeded friend declarations from cmCacheManager. --- Source/cmCacheManager.h | 2 -- Source/cmMakefile.cxx | 5 ----- Source/cmMakefile.h | 2 -- 3 files changed, 9 deletions(-) diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h index 64c7c0d..00ae334 100644 --- a/Source/cmCacheManager.h +++ b/Source/cmCacheManager.h @@ -248,10 +248,8 @@ private: CacheEntryMap Cache; // Only cmake and cmMakefile should be able to add cache values // the commands should never use the cmCacheManager directly - friend class cmMakefile; // allow access to add cache values friend class cmState; // allow access to add cache values friend class cmake; // allow access to add cache values - friend class cmMarkAsAdvancedCommand; // allow access to add cache values }; #endif diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index ca50bc7..94e4695 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3735,11 +3735,6 @@ void cmMakefile::GetListOfMacros(std::string& macros) const macros = cmJoin(this->MacrosList, ";"); } -cmCacheManager *cmMakefile::GetCacheManager() const -{ - return this->GetCMakeInstance()->GetCacheManager(); -} - cmState *cmMakefile::GetState() const { return this->GetCMakeInstance()->GetState(); diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 49bab4c..fad31d1 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -12,7 +12,6 @@ #ifndef cmMakefile_h #define cmMakefile_h -#include "cmCacheManager.h" #include "cmExecutionStatus.h" #include "cmListFileCache.h" #include "cmPolicies.h" @@ -765,7 +764,6 @@ public: ///enabled. void EnableLanguage(std::vectorconst& languages, bool optional); - cmCacheManager *GetCacheManager() const; cmState *GetState() const; /** -- cgit v0.12