Merge branch 'revert-cached-regex-clear' into revert-cached-regex-clear-for-master

Resolve conflict in Source/cmMakefile.h by integrating both changes.

1 files changed, 0 insertions, 47 deletions

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 6eca0f0..53fd56f 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -102,7 +102,6 @@ cmMakefile::cmMakefile(): Internal(new Internals)
   this->PreOrder = false;
   this->GeneratingBuildSystem = false;
 
-  this->NumLastMatches = 0;
   this->SuppressWatches = false;
 }
 
@@ -153,7 +152,6 @@ cmMakefile::cmMakefile(const cmMakefile& mf): Internal(new Internals)
   this->ListFileStack = mf.ListFileStack;
   this->OutputToSource = mf.OutputToSource;
 
-  this->NumLastMatches = mf.NumLastMatches;
   this->SuppressWatches = mf.SuppressWatches;
 }
 
@@ -4843,51 +4841,6 @@ std::vector<cmSourceFile*> cmMakefile::GetQtUiFilesWithOptions() const
   return this->QtUiFilesWithOptions;
 }
 
-static std::string matchVariables[] = {
-  "CMAKE_MATCH_0",
-  "CMAKE_MATCH_1",
-  "CMAKE_MATCH_2",
-  "CMAKE_MATCH_3",
-  "CMAKE_MATCH_4",
-  "CMAKE_MATCH_5",
-  "CMAKE_MATCH_6",
-  "CMAKE_MATCH_7",
-  "CMAKE_MATCH_8",
-  "CMAKE_MATCH_9"
-};
-
-//----------------------------------------------------------------------------
-void cmMakefile::ClearMatches()
-{
-  for (unsigned int i=0; i<this->NumLastMatches; i++)
-    {
-    std::string const& var = matchVariables[i];
-    std::string const& s = this->GetSafeDefinition(var);
-    if(!s.empty())
-      {
-      this->AddDefinition(var, "");
-      this->MarkVariableAsUsed(var);
-      }
-    }
-  this->NumLastMatches = 0;
-}
-
-//----------------------------------------------------------------------------
-void cmMakefile::StoreMatches(cmsys::RegularExpression& re)
-{
-  for (unsigned int i=0; i<10; i++)
-    {
-    std::string const& m = re.match(i);
-    if(!m.empty())
-      {
-      std::string const& var = matchVariables[i];
-      this->AddDefinition(var, m.c_str());
-      this->MarkVariableAsUsed(var);
-      this->NumLastMatches = i + 1;
-      }
-    }
-}
-
 //----------------------------------------------------------------------------
 cmPolicies::PolicyStatus
 cmMakefile::GetPolicyStatus(cmPolicies::PolicyID id) const