From 1d00ed7cf7ffd5c51dfcf77075589ab0e30d29a3 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 16 Mar 2018 12:21:29 -0400 Subject: cmPolicies: Drop unnecessary check from ApplyPolicyVersion This internal API is never called with `version_min` empty. --- Source/cmPolicies.cxx | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx index 7e3bd78..adb6e78 100644 --- a/Source/cmPolicies.cxx +++ b/Source/cmPolicies.cxx @@ -156,22 +156,16 @@ static bool GetPolicyDefault(cmMakefile* mf, std::string const& policy, bool cmPolicies::ApplyPolicyVersion(cmMakefile* mf, std::string const& version_min) { - std::string ver = "2.4.0"; - - if (!version_min.empty()) { - ver = version_min; - } - unsigned int majorVer = 2; unsigned int minorVer = 0; unsigned int patchVer = 0; unsigned int tweakVer = 0; // parse the string - if (sscanf(ver.c_str(), "%u.%u.%u.%u", &majorVer, &minorVer, &patchVer, - &tweakVer) < 2) { + if (sscanf(version_min.c_str(), "%u.%u.%u.%u", &majorVer, &minorVer, + &patchVer, &tweakVer) < 2) { std::ostringstream e; - e << "Invalid policy version value \"" << ver << "\". " + e << "Invalid policy version value \"" << version_min << "\". " << "A numeric major.minor[.patch[.tweak]] must be given."; mf->IssueMessage(cmake::FATAL_ERROR, e.str()); return false; -- cgit v0.12