summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-04-04 18:42:28 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-04-05 08:26:10 (GMT)
commitc37cf7fa9e0aa7f7c3a2b32457385a1caf37bc3c (patch)
treea8b906ec9a369728ad5dee728814db8a8ac59ee2
parent64556e3dfa4161b33110daba606439f2c7971b15 (diff)
downloadCMake-c37cf7fa9e0aa7f7c3a2b32457385a1caf37bc3c.zip
CMake-c37cf7fa9e0aa7f7c3a2b32457385a1caf37bc3c.tar.gz
CMake-c37cf7fa9e0aa7f7c3a2b32457385a1caf37bc3c.tar.bz2
cmCacheManager: Remove unused method
-rw-r--r--Source/cmCacheManager.cxx18
-rw-r--r--Source/cmCacheManager.h1
-rw-r--r--Source/cmMakefile.cxx5
-rw-r--r--Source/cmMakefile.h3
4 files changed, 0 insertions, 27 deletions
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 002ccd1..fa7eff3 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -896,21 +896,3 @@ bool cmCacheManager::CacheIterator::PropertyExists(
{
return this->GetProperty(prop)? true:false;
}
-
-//----------------------------------------------------------------------------
-bool cmCacheManager::NeedCacheCompatibility(int major, int minor)
-{
- // Compatibility is not needed if the cache version is zero because
- // the cache was created or modified by the user.
- if(this->CacheMajorVersion == 0)
- {
- return false;
- }
-
- // Compatibility is needed if the cache version is equal to or lower
- // than the given version.
- cmIML_INT_uint64_t actual_compat =
- CMake_VERSION_ENCODE(this->CacheMajorVersion, this->CacheMinorVersion, 0);
- return (actual_compat &&
- actual_compat <= CMake_VERSION_ENCODE(major, minor, 0));
-}
diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h
index 659d44a..f7f8776 100644
--- a/Source/cmCacheManager.h
+++ b/Source/cmCacheManager.h
@@ -144,7 +144,6 @@ public:
{ return this->CacheMajorVersion; }
unsigned int GetCacheMinorVersion() const
{ return this->CacheMinorVersion; }
- bool NeedCacheCompatibility(int major, int minor);
protected:
///! Add an entry into the cache
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ec1d814..215ee16 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -184,11 +184,6 @@ unsigned int cmMakefile::GetCacheMinorVersion() const
return this->GetCacheManager()->GetCacheMinorVersion();
}
-bool cmMakefile::NeedCacheCompatibility(int major, int minor) const
-{
- return this->GetCacheManager()->NeedCacheCompatibility(major, minor);
-}
-
cmMakefile::~cmMakefile()
{
cmDeleteAll(this->InstallGenerators);
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 7c2085a..920b6b7 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -78,9 +78,6 @@ public:
bool VariableInitialized(const std::string& ) const;
/* return true if a variable has been used */
bool VariableUsed(const std::string& ) const;
- /** Return whether compatibility features needed for a version of
- the cache or lower should be enabled. */
- bool NeedCacheCompatibility(int major, int minor) const;
/**
* Construct an empty makefile.