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/cmLocalNinjaGenerator.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/cmLocalNinjaGenerator.h')
| -rw-r--r-- | Source/cmLocalNinjaGenerator.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h index b0eb1da..bb16899 100644 --- a/Source/cmLocalNinjaGenerator.h +++ b/Source/cmLocalNinjaGenerator.h @@ -38,14 +38,14 @@ class cmLocalNinjaGenerator : public cmLocalCommonGenerator public: cmLocalNinjaGenerator(cmGlobalGenerator* gg, cmMakefile* mf); - ~cmLocalNinjaGenerator() CM_OVERRIDE; + ~cmLocalNinjaGenerator() override; - void Generate() CM_OVERRIDE; + void Generate() override; - cmRulePlaceholderExpander* CreateRulePlaceholderExpander() const CM_OVERRIDE; + cmRulePlaceholderExpander* CreateRulePlaceholderExpander() const override; - std::string GetTargetDirectory(cmGeneratorTarget const* target) const - CM_OVERRIDE; + std::string GetTargetDirectory( + cmGeneratorTarget const* target) const override; const cmGlobalNinjaGenerator* GetGlobalNinjaGenerator() const; cmGlobalNinjaGenerator* GetGlobalNinjaGenerator(); @@ -76,13 +76,13 @@ public: void ComputeObjectFilenames( std::map<cmSourceFile const*, std::string>& mapping, - cmGeneratorTarget const* gt = nullptr) CM_OVERRIDE; + cmGeneratorTarget const* gt = nullptr) override; protected: std::string ConvertToIncludeReference( std::string const& path, cmOutputConverter::OutputFormat format = cmOutputConverter::SHELL, - bool forceFullPaths = false) CM_OVERRIDE; + bool forceFullPaths = false) override; private: cmGeneratedFileStream& GetBuildFileStream() const; |