From 4c192fb53152a61015eb29c0a3826adeec16f8f8 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 7 Jun 2015 15:12:51 +0200 Subject: cmMakefile: Remove cacheOnly option from GetDefinitions. It is now unused. --- Source/cmMakefile.cxx | 13 +++---------- Source/cmMakefile.h | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index b083f70..2a3c51b 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2497,18 +2497,11 @@ const char* cmMakefile::GetSafeDefinition(const std::string& def) const return ret; } -std::vector cmMakefile -::GetDefinitions(int cacheonly /* = 0 */) const +std::vector cmMakefile::GetDefinitions() const { - std::vector res; - if ( !cacheonly ) - { - res = this->Internal->ClosureKeys(); - } - std::vector cacheKeys = - this->GetState()->GetCacheEntryKeys(); + std::vector res = this->Internal->ClosureKeys(); + std::vector cacheKeys = this->GetState()->GetCacheEntryKeys(); res.insert(res.end(), cacheKeys.begin(), cacheKeys.end()); - std::sort(res.begin(), res.end()); return res; } diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index def0c23..ca7d4b0 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -511,7 +511,7 @@ public: * cacheonly is specified and is greater than 0, then only cache * variables will be listed. */ - std::vector GetDefinitions(int cacheonly=0) const; + std::vector GetDefinitions() const; /** * Test a boolean variable to see if it is true or false. -- cgit v0.12