CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4502 from lioncash/build 

General: Tidy up clang-format warnings
master
bunnei 2020-08-11 11:04:05 +07:00 committed by GitHub
parent 257b1d2c4b 1c3490a8db
commit 4605e4d6ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/scripts/format/script.sh
Unescape Escape View File

@ -7,7 +7,9 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .ci* dis
fi fi
# Default clang-format points to default 3.5 version one # 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 $CLANG_FORMAT --version
if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then

2
CMakeLists.txt
Unescape Escape View File

@ -456,7 +456,7 @@ endif()
# against all the src files. This should be used before making a pull request. # 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 find_program(CLANG_FORMAT
NAMES clang-format${CLANG_FORMAT_POSTFIX} NAMES clang-format${CLANG_FORMAT_POSTFIX}
clang-format clang-format

2
src/common/bit_field.h
Unescape Escape View File

@ -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? // Would they initialize the storage or just the bitfield?
// Hence, delete them. Use the Assign method to set bitfield values! // Hence, delete them. Use the Assign method to set bitfield values!
BitField(T val) = delete; BitField(T val) = delete;