diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2014-11-26 17:55:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-26 18:45:06 (GMT) |
| commit | 7d674b5f0b28a610333644d417c2e8cb796cc9e4 (patch) | |
| tree | 362847564a783ffb8fe9580fa98df3627a12372c /Source/cmStringCommand.h | |
| parent | d2f2a2e226a8717d6fdb6df0ed4858d1629f557c (diff) | |
| download | CMake-7d674b5f0b28a610333644d417c2e8cb796cc9e4.zip CMake-7d674b5f0b28a610333644d417c2e8cb796cc9e4.tar.gz CMake-7d674b5f0b28a610333644d417c2e8cb796cc9e4.tar.bz2 | |
Revert "ClearMatches: Only clear matches which were actually set" (#15261)
This reverts commit v3.1.0-rc1~557^2~2 (ClearMatches: Only clear matches
which were actually set, 2014-03-12). The optimization did not track
the match count in the same scope as the variables, allowing possible
inconsistency.
Resolve conflicts in Source/cmIfCommand.cxx, Source/cmMakefile.cxx,
and Source/cmMakefile.h by moving the changes to the new location
of the code involved.
Diffstat (limited to 'Source/cmStringCommand.h')
| -rw-r--r-- | Source/cmStringCommand.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmStringCommand.h b/Source/cmStringCommand.h index 9c75095..a5fe893 100644 --- a/Source/cmStringCommand.h +++ b/Source/cmStringCommand.h @@ -53,6 +53,8 @@ public: virtual std::string GetName() const { return "string";} cmTypeMacro(cmStringCommand, cmCommand); + static void ClearMatches(cmMakefile* mf); + static void StoreMatches(cmMakefile* mf, cmsys::RegularExpression& re); protected: bool HandleConfigureCommand(std::vector<std::string> const& args); bool HandleAsciiCommand(std::vector<std::string> const& args); |