diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-18 14:06:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-18 14:06:47 (GMT) |
| commit | ce4f6354096921f7e32d6354d6550ff5724659ab (patch) | |
| tree | e2b0b18fbb23c61eec1bacd971aa07179c0e9d08 /Source/cmTryRunCommand.h | |
| parent | c29e85d009c526fb18296eb9b2c181cdad6e7e3a (diff) | |
| parent | 98530d3c14a5f8002967fe73829fb105b47cc499 (diff) | |
| download | CMake-ce4f6354096921f7e32d6354d6550ff5724659ab.zip CMake-ce4f6354096921f7e32d6354d6550ff5724659ab.tar.gz CMake-ce4f6354096921f7e32d6354d6550ff5724659ab.tar.bz2 | |
Merge topic 'cxx11-override'
98530d3c cm_codecvt: Tell IWYU to keep cmConfigure.h
4e14498f Drop now-unused definition of CM_OVERRIDE
0b33aee4 Use C++11 override instead of CM_OVERRIDE
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1265
Diffstat (limited to 'Source/cmTryRunCommand.h')
| -rw-r--r-- | Source/cmTryRunCommand.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmTryRunCommand.h b/Source/cmTryRunCommand.h index 732dff1..b632ef5 100644 --- a/Source/cmTryRunCommand.h +++ b/Source/cmTryRunCommand.h @@ -24,14 +24,14 @@ public: /** * This is a virtual constructor for the command. */ - cmCommand* Clone() CM_OVERRIDE { return new cmTryRunCommand; } + cmCommand* Clone() override { return new cmTryRunCommand; } /** * This is called when the command is first encountered in * the CMakeLists.txt file. */ bool InitialPass(std::vector<std::string> const& args, - cmExecutionStatus& status) CM_OVERRIDE; + cmExecutionStatus& status) override; private: void RunExecutable(const std::string& runArgs, |