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/cmCTestMemCheckHandler.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/cmCTestMemCheckHandler.cxx')
-rw-r--r-- | Source/CTest/cmCTestMemCheckHandler.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index 5f70f66..6f1a2c4 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -61,7 +61,7 @@ public: this->CTest = c; this->SetErrorCallback(xmlReportError, (void*)c); } - void StartElement(const std::string& name, const char** atts) + void StartElement(const std::string& name, const char** atts) CM_OVERRIDE { if (name == "MemoryLeak" || name == "ResourceLeak") { this->Errors.push_back(cmCTestMemCheckHandler::MLK); @@ -78,7 +78,7 @@ public: ostr << "\n"; this->Log += ostr.str(); } - void EndElement(const std::string&) {} + void EndElement(const std::string&) CM_OVERRIDE {} const char* GetAttribute(const char* name, const char** atts) { |