diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-03 14:45:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-03 14:45:52 (GMT) |
| commit | 3d6638471a87c2d5f568097d5bda6e7021a45a38 (patch) | |
| tree | 388493c0a3001b8d025faebb304491d2f7ab0601 /Source/CTest/cmCTestMemCheckHandler.cxx | |
| parent | e3f763765998b25707c364151a270e70d16e1744 (diff) | |
| parent | c6220de27605f33b2793729680c32714cd126690 (diff) | |
| download | CMake-3d6638471a87c2d5f568097d5bda6e7021a45a38.zip CMake-3d6638471a87c2d5f568097d5bda6e7021a45a38.tar.gz CMake-3d6638471a87c2d5f568097d5bda6e7021a45a38.tar.bz2 | |
Merge topic 'size-empty'
c6220de2 Use the empty() method to check for emptyness.
Diffstat (limited to 'Source/CTest/cmCTestMemCheckHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestMemCheckHandler.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index f8ffd43..5b5caea 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -499,11 +499,12 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking() // Setup the options std::string memoryTesterOptions; - if (this->CTest->GetCTestConfiguration("MemoryCheckCommandOptions").size()) { + if (!this->CTest->GetCTestConfiguration("MemoryCheckCommandOptions") + .empty()) { memoryTesterOptions = this->CTest->GetCTestConfiguration("MemoryCheckCommandOptions"); - } else if (this->CTest->GetCTestConfiguration("ValgrindCommandOptions") - .size()) { + } else if (!this->CTest->GetCTestConfiguration("ValgrindCommandOptions") + .empty()) { memoryTesterOptions = this->CTest->GetCTestConfiguration("ValgrindCommandOptions"); } @@ -522,8 +523,8 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking() this->MemoryTesterOptions.push_back("--show-reachable=yes"); this->MemoryTesterOptions.push_back("--num-callers=50"); } - if (this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile") - .size()) { + if (!this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile") + .empty()) { if (!cmSystemTools::FileExists( this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile") .c_str())) { |