diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-09 14:33:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-09 14:33:47 (GMT) |
| commit | 7e6e37fdf1bf24194edad6fa8640b7fa8e92e393 (patch) | |
| tree | 2bb577adab7d56746d549ff10969377a7084245a | |
| parent | d4d24c30f0648e45e43835fa104debacae0b4a7f (diff) | |
| parent | 5b02bcf682d8ed851f4733c5af61c471cf00296b (diff) | |
| download | CMake-7e6e37fdf1bf24194edad6fa8640b7fa8e92e393.zip CMake-7e6e37fdf1bf24194edad6fa8640b7fa8e92e393.tar.gz CMake-7e6e37fdf1bf24194edad6fa8640b7fa8e92e393.tar.bz2 | |
Merge topic 'no-return-void-expression'
5b02bcf6 QtDialog/FirstConfigure: remove 'return' from void expression
2d1c05c1 cmGlobalGenerator: remove 'return' from void expression
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !941
| -rw-r--r-- | Source/QtDialog/FirstConfigure.cxx | 2 | ||||
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/QtDialog/FirstConfigure.cxx b/Source/QtDialog/FirstConfigure.cxx index b193a27..88ce7cb 100644 --- a/Source/QtDialog/FirstConfigure.cxx +++ b/Source/QtDialog/FirstConfigure.cxx @@ -301,7 +301,7 @@ QString CrossCompilerSetup::getFindRoot() const void CrossCompilerSetup::setFindRoot(const QString& t) { - return this->crossFindRoot->setText(t); + this->crossFindRoot->setText(t); } int CrossCompilerSetup::getProgramMode() const diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 099f705..591963f 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1075,7 +1075,7 @@ bool cmGlobalGenerator::GetLanguageEnabled(const std::string& l) const void cmGlobalGenerator::ClearEnabledLanguages() { - return this->CMakeInstance->GetState()->ClearEnabledLanguages(); + this->CMakeInstance->GetState()->ClearEnabledLanguages(); } void cmGlobalGenerator::CreateLocalGenerators() |