diff options
| author | Nathan Gauër <brioche@google.com> | 2022-10-27 15:17:31 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-27 15:17:31 +0300 |
| commit | b49a2caa7cb2c447c3aa6f0977e230a3372289ab (patch) | |
| tree | e57c45ccd02c202437d59ef538460b3ee49f43fe | |
| parent | da215f10c991675b9c1ecb7eef2378e23b2d1276 (diff) | |
Revert "test" (#4974)
This reverts commit da215f10c991675b9c1ecb7eef2378e23b2d1276.
| -rw-r--r-- | .clang-format | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/opt/feature_manager.cpp | 4 |
3 files changed, 2 insertions, 5 deletions
diff --git a/.clang-format b/.clang-format index 5bf32ea48..1d43c4ed4 100644 --- a/.clang-format +++ b/.clang-format @@ -3,5 +3,4 @@ Language: Cpp BasedOnStyle: Google DerivePointerAlignment: false SortIncludes: true -AllowShortIfStatementsOnASingleLine: true ... diff --git a/CMakeLists.txt b/CMakeLists.txt index b9ddfa5e6..1b8fe92f4 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++17 -fno-exceptions) + target_compile_options(${TARGET} PRIVATE -std=c++11 -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 cb1b38f8e..a59027167 100644 --- a/source/opt/feature_manager.cpp +++ b/source/opt/feature_manager.cpp @@ -52,9 +52,7 @@ void FeatureManager::RemoveExtension(Extension ext) { } void FeatureManager::AddCapability(SpvCapability cap) { - if (capabilities_.Contains(cao)) - // toto - return; + if (capabilities_.Contains(cap)) return; capabilities_.Add(cap); |