diff options
| author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-07-04 23:43:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-04 23:43:39 -0700 |
| commit | a028894855f29c49d4bf8b0f745c66e1ea7dd4c6 (patch) | |
| tree | d14a80143654aecc20cce813975af6fff40e4f25 | |
| parent | 183ed7b90bbe015b09f545087387e1345ccaf927 (diff) | |
| download | PrismLauncher-a028894855f29c49d4bf8b0f745c66e1ea7dd4c6.tar.gz PrismLauncher-a028894855f29c49d4bf8b0f745c66e1ea7dd4c6.tar.bz2 PrismLauncher-a028894855f29c49d4bf8b0f745c66e1ea7dd4c6.zip | |
Apply suggestions from code review
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/Version_test.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0abedab9..bc988b4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,7 @@ option(DEBUG_ADDRESS_SANITIZER "Enable Address Sanitizer in Debug builds" on) # If this is a Debug build turn on address sanitiser if (CMAKE_BUILD_TYPE STREQUAL "Debug" AND DEBUG_ADDRESS_SANITIZER) - message(STATUS "Address Sanitizer enabeled for Debug builds, Turn it off with -DDEBUG_ADDRESS_SANITIZER=off") + message(STATUS "Address Sanitizer enabled for Debug builds, Turn it off with -DDEBUG_ADDRESS_SANITIZER=off") if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC") # using clang with clang-cl front end @@ -98,12 +98,12 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug" AND DEBUG_ADDRESS_SANITIZER) else() # AppleClang and Clang message(STATUS "Address Sanitizer available on Clang") - set(CMAKE_CXX_FLAGS "${cmake_cxx_flags} -fsanitize=address -O1 -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}} -fsanitize=address -O1 -fno-omit-frame-pointer") endif() elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") # GCC message(STATUS "Address Sanitizer available on GCC") - set(CMAKE_CXX_FLAGS "${cmake_cxx_flags} -fsanitize=address -O1 -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -O1 -fno-omit-frame-pointer") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") message(STATUS "Address Sanitizer available on MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address /O1 /Oy-") diff --git a/tests/Version_test.cpp b/tests/Version_test.cpp index 0f8c1652..f5488cbc 100644 --- a/tests/Version_test.cpp +++ b/tests/Version_test.cpp @@ -145,10 +145,10 @@ class VersionTest : public QObject { void test_flexVerTestVector() { - QString first = *static_cast<QString*>(QTest ::qData("first", ::qMetaTypeId<typename std ::remove_cv<QString>::type>())); - QString second = *static_cast<QString*>(QTest ::qData("second", ::qMetaTypeId<typename std ::remove_cv<QString>::type>())); - bool lessThan = *static_cast<bool*>(QTest ::qData("lessThan", ::qMetaTypeId<typename std ::remove_cv<bool>::type>())); - bool equal = *static_cast<bool*>(QTest ::qData("equal", ::qMetaTypeId<typename std ::remove_cv<bool>::type>())); + QFETCH(QString, first); + QFETCH(QString, second); + QFETCH(bool, lessThan); + QFETCH(bool, equal); const auto v1 = Version(first); const auto v2 = Version(second); |