mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 04:40:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix Clang -Wbitwise-instead-of-logical warnings

Browse Source
This commit is contained in:
Brad King
2021-10-13 10:00:08 -04:00
parent 315fc296e3
commit 09f4edbcef
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CPack/cmCPackGenerator.cxx
View File

@@ -186,7 +186,7 @@ int cmCPackGenerator::InstallProject()
std::string bareTempInstallDirectory = std::string bareTempInstallDirectory =
this->GetOption("CPACK_TEMPORARY_INSTALL_DIRECTORY"); this->GetOption("CPACK_TEMPORARY_INSTALL_DIRECTORY");
std::string tempInstallDirectoryStr = bareTempInstallDirectory; std::string tempInstallDirectoryStr = bareTempInstallDirectory;
bool setDestDir = cmIsOn(this->GetOption("CPACK_SET_DESTDIR")) | bool setDestDir = cmIsOn(this->GetOption("CPACK_SET_DESTDIR")) ||
cmIsInternallyOn(this->GetOption("CPACK_SET_DESTDIR")); cmIsInternallyOn(this->GetOption("CPACK_SET_DESTDIR"));
if (!setDestDir) { if (!setDestDir) {
tempInstallDirectoryStr += this->GetPackagingInstallPrefix(); tempInstallDirectoryStr += this->GetPackagingInstallPrefix();

13
Tests/CMakeLib/testUVRAII.cxx
View File

@@ -221,10 +221,15 @@ static bool testLoopDestructor()
int testUVRAII(int, char** const) int testUVRAII(int, char** const)
{ {
if ((testAsyncShutdown() && if (!testAsyncShutdown()) {
testAsyncDtor() & testAsyncMove() & testCrossAssignment() &
testAllMoves() & testLoopReset() & testLoopDestructor()) == 0) {
return -1; return -1;
} }
return 0; bool passed = true;
passed = testAsyncDtor() && passed;
passed = testAsyncMove() && passed;
passed = testCrossAssignment() && passed;
passed = testAllMoves() && passed;
passed = testLoopReset() && passed;
passed = testLoopDestructor() && passed;
return passed ? 0 : -1;
} }