N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

clang format (#7017)

Browse source
This commit is contained in:
Vitor K 2023-09-27 13:42:19 -03:00 committed by GitHub
parent 5ced2c7af9
commit 6cfb8e02a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 48 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/android/app/src/main/jni/camera/ndk_camera.cpp
View file

@ -42,9 +42,7 @@ struct CaptureSession final {
#define MEMBER(type, name, func) \ #define MEMBER(type, name, func) \
struct type##Deleter { \ struct type##Deleter { \
void operator()(type* ptr) { \ void operator()(type* ptr) { type##_##func(ptr); } \
type##_##func(ptr); \
} \
}; \ }; \
std::unique_ptr<type, type##Deleter> name std::unique_ptr<type, type##Deleter> name

12
src/common/settings.h
View file

@ -178,7 +178,8 @@ public:
* @param default_val Intial value of the setting, and default value of the setting * @param default_val Intial value of the setting, and default value of the setting
* @param name Label for the setting * @param name Label for the setting
*/ */
explicit Setting(const Type& default_val, const std::string& name) requires(!ranged) explicit Setting(const Type& default_val, const std::string& name)
requires(!ranged)
: value{default_val}, default_value{default_val}, label{name} {} : value{default_val}, default_value{default_val}, label{name} {}
virtual ~Setting() = default; virtual ~Setting() = default;
@ -191,7 +192,8 @@ public:
* @param name Label for the setting * @param name Label for the setting
*/ */
explicit Setting(const Type& default_val, const Type& min_val, const Type& max_val, explicit Setting(const Type& default_val, const Type& min_val, const Type& max_val,
const std::string& name) requires(ranged) const std::string& name)
requires(ranged)
: value{default_val}, : value{default_val},
default_value{default_val}, maximum{max_val}, minimum{min_val}, label{name} {} default_value{default_val}, maximum{max_val}, minimum{min_val}, label{name} {}
@ -279,7 +281,8 @@ public:
* @param default_val Intial value of the setting, and default value of the setting * @param default_val Intial value of the setting, and default value of the setting
* @param name Label for the setting * @param name Label for the setting
*/ */
explicit SwitchableSetting(const Type& default_val, const std::string& name) requires(!ranged) explicit SwitchableSetting(const Type& default_val, const std::string& name)
requires(!ranged)
: Setting<Type>{default_val, name} {} : Setting<Type>{default_val, name} {}
virtual ~SwitchableSetting() = default; virtual ~SwitchableSetting() = default;
@ -292,7 +295,8 @@ public:
* @param name Label for the setting * @param name Label for the setting
*/ */
explicit SwitchableSetting(const Type& default_val, const Type& min_val, const Type& max_val, explicit SwitchableSetting(const Type& default_val, const Type& min_val, const Type& max_val,
const std::string& name) requires(ranged) const std::string& name)
requires(ranged)
: Setting<Type, true>{default_val, min_val, max_val, name} {} : Setting<Type, true>{default_val, min_val, max_val, name} {}
/** /**

16
src/common/vector_math.h
View file

@ -396,9 +396,7 @@ public:
// _DEFINE_SWIZZLER2 defines a single such function, DEFINE_SWIZZLER2 defines all of them for all // _DEFINE_SWIZZLER2 defines a single such function, DEFINE_SWIZZLER2 defines all of them for all
// component names (x<->r) and permutations (xy<->yx) // component names (x<->r) and permutations (xy<->yx)
#define _DEFINE_SWIZZLER2(a, b, name) \ #define _DEFINE_SWIZZLER2(a, b, name) \
[[nodiscard]] constexpr Vec2<T> name() const { \ [[nodiscard]] constexpr Vec2<T> name() const { return Vec2<T>(a, b); }
return Vec2<T>(a, b); \
}
#define DEFINE_SWIZZLER2(a, b, a2, b2, a3, b3, a4, b4) \ #define DEFINE_SWIZZLER2(a, b, a2, b2, a3, b3, a4, b4) \
_DEFINE_SWIZZLER2(a, b, a##b); \ _DEFINE_SWIZZLER2(a, b, a##b); \
_DEFINE_SWIZZLER2(a, b, a2##b2); \ _DEFINE_SWIZZLER2(a, b, a2##b2); \
@ -598,9 +596,7 @@ public:
// DEFINE_SWIZZLER2_COMP2 defines two component functions for all component names (x<->r) and // DEFINE_SWIZZLER2_COMP2 defines two component functions for all component names (x<->r) and
// permutations (xy<->yx) // permutations (xy<->yx)
#define _DEFINE_SWIZZLER2(a, b, name) \ #define _DEFINE_SWIZZLER2(a, b, name) \
[[nodiscard]] constexpr Vec2<T> name() const { \ [[nodiscard]] constexpr Vec2<T> name() const { return Vec2<T>(a, b); }
return Vec2<T>(a, b); \
}
#define DEFINE_SWIZZLER2_COMP1(a, a2) \ #define DEFINE_SWIZZLER2_COMP1(a, a2) \
_DEFINE_SWIZZLER2(a, a, a##a); \ _DEFINE_SWIZZLER2(a, a, a##a); \
_DEFINE_SWIZZLER2(a, a, a2##a2) _DEFINE_SWIZZLER2(a, a, a2##a2)
@ -625,9 +621,7 @@ public:
#undef _DEFINE_SWIZZLER2 #undef _DEFINE_SWIZZLER2
#define _DEFINE_SWIZZLER3(a, b, c, name) \ #define _DEFINE_SWIZZLER3(a, b, c, name) \
[[nodiscard]] constexpr Vec3<T> name() const { \ [[nodiscard]] constexpr Vec3<T> name() const { return Vec3<T>(a, b, c); }
return Vec3<T>(a, b, c); \
}
#define DEFINE_SWIZZLER3_COMP1(a, a2) \ #define DEFINE_SWIZZLER3_COMP1(a, a2) \
_DEFINE_SWIZZLER3(a, a, a, a##a##a); \ _DEFINE_SWIZZLER3(a, a, a, a##a##a); \
_DEFINE_SWIZZLER3(a, a, a, a2##a2##a2) _DEFINE_SWIZZLER3(a, a, a, a2##a2##a2)
@ -690,8 +684,8 @@ template <typename T>
// linear interpolation via float: 0.0=begin, 1.0=end // linear interpolation via float: 0.0=begin, 1.0=end
template <typename X> template <typename X>
[[nodiscard]] constexpr decltype(X{} * float{} + X{} * float{}) [[nodiscard]] constexpr decltype(X{} * float{} + X{} * float{}) Lerp(const X& begin, const X& end,
Lerp(const X& begin, const X& end, const float t) { const float t) {
return begin * (1.f - t) + end * t; return begin * (1.f - t) + end * t;
} }