diff options
| author | bunnei <bunneidev@gmail.com> | 2020-08-11 17:04:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 17:04:05 +0200 |
| commit | 4605e4d6ff1523bf43b3803b9db95e64602f4099 (patch) | |
| tree | 5df6b0b713f57432d861e14a9211391066ba25eb | |
| parent | Merge pull request #4496 from lioncash/ce-desig (diff) | |
| parent | General: Tidy up clang-format warnings (diff) | |
| download | yuzu-4605e4d6ff1523bf43b3803b9db95e64602f4099.tar yuzu-4605e4d6ff1523bf43b3803b9db95e64602f4099.tar.gz yuzu-4605e4d6ff1523bf43b3803b9db95e64602f4099.tar.bz2 yuzu-4605e4d6ff1523bf43b3803b9db95e64602f4099.tar.lz yuzu-4605e4d6ff1523bf43b3803b9db95e64602f4099.tar.xz yuzu-4605e4d6ff1523bf43b3803b9db95e64602f4099.tar.zst yuzu-4605e4d6ff1523bf43b3803b9db95e64602f4099.zip | |
| -rw-r--r-- | .ci/scripts/format/script.sh | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/common/bit_field.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/.ci/scripts/format/script.sh b/.ci/scripts/format/script.sh index 991fe1552..1177d5c0c 100644 --- a/.ci/scripts/format/script.sh +++ b/.ci/scripts/format/script.sh @@ -7,7 +7,9 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .ci* dis fi # Default clang-format points to default 3.5 version one -CLANG_FORMAT=clang-format-10.0 +CLANG_FORMAT=clang-format-10 +ls /usr/bin + $CLANG_FORMAT --version if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then diff --git a/CMakeLists.txt b/CMakeLists.txt index 3282ae9d4..8ecc2e476 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -456,7 +456,7 @@ endif() # against all the src files. This should be used before making a pull request. # ======================================================================= -set(CLANG_FORMAT_POSTFIX "-6.0") +set(CLANG_FORMAT_POSTFIX "-10") find_program(CLANG_FORMAT NAMES clang-format${CLANG_FORMAT_POSTFIX} clang-format diff --git a/src/common/bit_field.h b/src/common/bit_field.h index 26ae6c7fc..dfa38a357 100644 --- a/src/common/bit_field.h +++ b/src/common/bit_field.h @@ -161,7 +161,7 @@ public: } } - // This constructor and assignment operator might be considered ambiguous: + /// This constructor and assignment operator might be considered ambiguous: // Would they initialize the storage or just the bitfield? // Hence, delete them. Use the Assign method to set bitfield values! BitField(T val) = delete; |