diff options
| author | Nathan Gauër <brioche@google.com> | 2022-10-26 19:36:08 +0300 |
|---|---|---|
| committer | Nathan Gauër <brioche@google.com> | 2022-10-26 19:42:29 +0300 |
| commit | da215f10c991675b9c1ecb7eef2378e23b2d1276 (patch) | |
| tree | f27757de166c5d9763c9df5cd72acd1dd3cd323c | |
| parent | 7326b967a52aecef25b3fedaaba388d6616db93d (diff) | |
test
| -rw-r--r-- | .clang-format | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/opt/feature_manager.cpp | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/.clang-format b/.clang-format index 1d43c4ed4..5bf32ea48 100644 --- a/.clang-format +++ b/.clang-format @@ -3,4 +3,5 @@ Language: Cpp BasedOnStyle: Google DerivePointerAlignment: false SortIncludes: true +AllowShortIfStatementsOnASingleLine: true ... diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b8fe92f4..b9ddfa5e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -188,7 +188,7 @@ function(spvtools_default_compile_options TARGET) target_compile_options(${TARGET} PRIVATE ${SPIRV_WARNINGS}) if (${COMPILER_IS_LIKE_GNU}) - target_compile_options(${TARGET} PRIVATE -std=c++11 -fno-exceptions) + target_compile_options(${TARGET} PRIVATE -std=c++17 -fno-exceptions) target_compile_options(${TARGET} PRIVATE -Wall -Wextra -Wno-long-long -Wshadow -Wundef -Wconversion -Wno-sign-conversion) diff --git a/source/opt/feature_manager.cpp b/source/opt/feature_manager.cpp index a59027167..cb1b38f8e 100644 --- a/source/opt/feature_manager.cpp +++ b/source/opt/feature_manager.cpp @@ -52,7 +52,9 @@ void FeatureManager::RemoveExtension(Extension ext) { } void FeatureManager::AddCapability(SpvCapability cap) { - if (capabilities_.Contains(cap)) return; + if (capabilities_.Contains(cao)) + // toto + return; capabilities_.Add(cap); |