mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-08 05:59:08 +01:00
Merge pull request #4502 from lioncash/build
General: Tidy up clang-format warnings
This commit is contained in:
commit
4605e4d6ff
3 changed files with 5 additions and 3 deletions
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue