diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-27 14:40:35 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-27 14:40:35 (GMT) |
| commit | d3544d023b7b118f5f9fcb70808546d7b3724f50 (patch) | |
| tree | 95c008ea092df8c3e1666c4a4d900148bfcd0319 /Source/CTest/cmCTestScriptHandler.cxx | |
| parent | 4adab7093a2a30caf053b149a3b57565235b05ca (diff) | |
| parent | 7647f6afa46b6b5020cc1d93b3f75d3358a28f8a (diff) | |
| download | CMake-d3544d023b7b118f5f9fcb70808546d7b3724f50.zip CMake-d3544d023b7b118f5f9fcb70808546d7b3724f50.tar.gz CMake-d3544d023b7b118f5f9fcb70808546d7b3724f50.tar.bz2 | |
Merge topic 'compiler-features'
7647f6af Add CM_OVERRIDE to some functions
5286110d cxx features: add check for override
09aa2c94 Use <unordered_set> where available
ea5477e4 Make C++ feature checks extensible
Diffstat (limited to 'Source/CTest/cmCTestScriptHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestScriptHandler.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index 6389a9d..028cfdd 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -60,8 +60,8 @@ class cmCTestScriptFunctionBlocker : public cmFunctionBlocker public: cmCTestScriptFunctionBlocker() {} virtual ~cmCTestScriptFunctionBlocker() {} - virtual bool IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile& mf, - cmExecutionStatus&); + bool IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile& mf, + cmExecutionStatus&) CM_OVERRIDE; // virtual bool ShouldRemove(const cmListFileFunction& lff, cmMakefile &mf); // virtual void ScopeEnded(cmMakefile &mf); |