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/cmProcessTools.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/cmProcessTools.h')
-rw-r--r-- | Source/cmProcessTools.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmProcessTools.h b/Source/cmProcessTools.h index 5b357cd..23fa74e 100644 --- a/Source/cmProcessTools.h +++ b/Source/cmProcessTools.h @@ -59,7 +59,7 @@ public: char Separator; char LineEnd; bool IgnoreCR; - bool ProcessChunk(const char* data, int length) CM_OVERRIDE; + bool ProcessChunk(const char* data, int length) override; /** Implement in a subclass to process one line of input. It should return true only if it is interested in more data. */ @@ -76,7 +76,7 @@ public: } private: - bool ProcessLine() CM_OVERRIDE { return true; } + bool ProcessLine() override { return true; } }; /** Run a process and send output to given parsers. */ |