diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-26 18:53:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-26 18:53:06 (GMT) |
| commit | 808c77e2319a4a81a86b2df3bf8fbba6bdbac7ac (patch) | |
| tree | 97ba6bf36741c5fadc780b6b9242ebdfae8f4b64 /Source/cmMakefile.h | |
| parent | 82582c96bd86969ee5e1cc6f7bc4e5b12e1717e1 (diff) | |
| parent | 7d674b5f0b28a610333644d417c2e8cb796cc9e4 (diff) | |
| download | CMake-808c77e2319a4a81a86b2df3bf8fbba6bdbac7ac.zip CMake-808c77e2319a4a81a86b2df3bf8fbba6bdbac7ac.tar.gz CMake-808c77e2319a4a81a86b2df3bf8fbba6bdbac7ac.tar.bz2 | |
Merge branch 'revert-cached-regex-clear' into revert-cached-regex-clear-for-master
Resolve conflict in Source/cmMakefile.h by integrating both changes.
Diffstat (limited to 'Source/cmMakefile.h')
| -rw-r--r-- | Source/cmMakefile.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 41dddc3..05b7a37 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -972,9 +972,6 @@ public: std::string const& lhs, std::string const& rhs); - void ClearMatches(); - void StoreMatches(cmsys::RegularExpression& re); - void PushLoopBlock(); void PopLoopBlock(); bool IsLoopBlock() const; @@ -1186,8 +1183,6 @@ private: std::vector<cmSourceFile*> QtUiFilesWithOptions; - unsigned int NumLastMatches; - bool AddRequiredTargetCFeature(cmTarget *target, const std::string& feature) const; |