ENH: Refactor find_package version file scoping

This converts the variable and policy scope protection find_package()
uses when loading version files to use automatic variables.

1 files changed, 4 insertions, 6 deletions

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index a00bf4b..a57a4f1 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1277,8 +1277,10 @@ bool cmFindPackageCommand::CheckVersion(std::string const& config_file)
 bool cmFindPackageCommand::CheckVersionFile(std::string const& version_file)
 {
   // The version file will be loaded in an isolated scope.
-  this->Makefile->PushScope();
-  this->Makefile->PushPolicy();
+  cmMakefile::ScopePushPop varScope(this->Makefile);
+  cmMakefile::PolicyPushPop polScope(this->Makefile);
+  static_cast<void>(varScope);
+  static_cast<void>(polScope);
 
   // Clear the output variables.
   this->Makefile->RemoveDefinition("PACKAGE_VERSION");
@@ -1344,10 +1346,6 @@ bool cmFindPackageCommand::CheckVersionFile(std::string const& version_file)
       }
     }
 
-  // Restore the original scope.
-  this->Makefile->PopPolicy();
-  this->Makefile->PopScope();
-
   // Succeed if the version is suitable.
   return suitable;
 }