diff --git a/CommonLibF4/include/F4SE/Impl/PCH.h b/CommonLibF4/include/F4SE/Impl/PCH.h index 73dea6af..2a5e7441 100644 --- a/CommonLibF4/include/F4SE/Impl/PCH.h +++ b/CommonLibF4/include/F4SE/Impl/PCH.h @@ -96,13 +96,14 @@ namespace F4SE requires( const K& a_transparent, const typename C::key_type& a_key, - typename C::key_compare& a_compare) { - typename C::key_compare::is_transparent; - // clang-format off + typename C::key_compare& a_compare) + { + typename C::key_compare::is_transparent; + // clang-format off { a_compare(a_transparent, a_key) } -> std::convertible_to; { a_compare(a_key, a_transparent) } -> std::convertible_to; - // clang-format on - }; + // clang-format on + }; namespace nttp { @@ -142,9 +143,9 @@ namespace F4SE string(const CharT (&)[N]) -> string; } - template // - requires(std::invocable>) // - class scope_exit + template // + requires(std::invocable>) // + class scope_exit { public: // 1) @@ -286,8 +287,7 @@ namespace F4SE template constexpr enumeration(Args... a_values) noexcept // - requires(std::same_as && ...) - : + requires(std::same_as&&...) : _impl((static_cast(a_values) | ...)) {} @@ -316,7 +316,7 @@ namespace F4SE template constexpr enumeration& set(Args... a_args) noexcept // - requires(std::same_as && ...) + requires(std::same_as&&...) { _impl |= (static_cast(a_args) | ...); return *this; @@ -324,7 +324,7 @@ namespace F4SE template constexpr enumeration& reset(Args... a_args) noexcept // - requires(std::same_as && ...) + requires(std::same_as&&...) { _impl &= ~(static_cast(a_args) | ...); return *this; @@ -338,21 +338,21 @@ namespace F4SE template [[nodiscard]] constexpr bool any(Args... a_args) const noexcept // - requires(std::same_as && ...) + requires(std::same_as&&...) { return (_impl & (static_cast(a_args) | ...)) != static_cast(0); } template [[nodiscard]] constexpr bool all(Args... a_args) const noexcept // - requires(std::same_as && ...) + requires(std::same_as&&...) { return (_impl & (static_cast(a_args) | ...)) == (static_cast(a_args) | ...); } template [[nodiscard]] constexpr bool none(Args... a_args) const noexcept // - requires(std::same_as && ...) + requires(std::same_as&&...) { return (_impl & (static_cast(a_args) | ...)) == static_cast(0); } @@ -385,14 +385,14 @@ namespace F4SE #define F4SE_MAKE_ARITHMETIC_OP(a_op) \ template \ [[nodiscard]] constexpr auto operator a_op(enumeration a_enum, U a_shift) noexcept \ - -> enumeration \ + ->enumeration \ { \ return static_cast(static_cast(a_enum.get()) a_op a_shift); \ } \ \ template \ constexpr auto operator a_op##=(enumeration& a_enum, U a_shift) noexcept \ - -> enumeration& \ + ->enumeration& \ { \ return a_enum = a_enum a_op a_shift; \ } @@ -400,42 +400,42 @@ namespace F4SE #define F4SE_MAKE_ENUMERATION_OP(a_op) \ template \ [[nodiscard]] constexpr auto operator a_op(enumeration a_lhs, enumeration a_rhs) noexcept \ - -> enumeration> \ + ->enumeration> \ { \ return static_cast(static_cast(a_lhs.get()) a_op static_cast(a_rhs.get())); \ } \ \ template \ [[nodiscard]] constexpr auto operator a_op(enumeration a_lhs, E a_rhs) noexcept \ - -> enumeration \ + ->enumeration \ { \ return static_cast(static_cast(a_lhs.get()) a_op static_cast(a_rhs)); \ } \ \ template \ [[nodiscard]] constexpr auto operator a_op(E a_lhs, enumeration a_rhs) noexcept \ - -> enumeration \ + ->enumeration \ { \ return static_cast(static_cast(a_lhs) a_op static_cast(a_rhs.get())); \ } \ \ template \ constexpr auto operator a_op##=(enumeration& a_lhs, enumeration a_rhs) noexcept \ - -> enumeration& \ + ->enumeration& \ { \ return a_lhs = a_lhs a_op a_rhs; \ } \ \ template \ constexpr auto operator a_op##=(enumeration& a_lhs, E a_rhs) noexcept \ - -> enumeration& \ + ->enumeration& \ { \ return a_lhs = a_lhs a_op a_rhs; \ } \ \ template \ constexpr auto operator a_op##=(E& a_lhs, enumeration a_rhs) noexcept \ - -> E& \ + ->E& \ { \ return a_lhs = *(a_lhs a_op a_rhs); \ } @@ -443,14 +443,14 @@ namespace F4SE #define F4SE_MAKE_INCREMENTER_OP(a_op) \ template \ constexpr auto operator a_op##a_op(enumeration& a_lhs) noexcept \ - -> enumeration& \ + ->enumeration& \ { \ return a_lhs a_op## = static_cast(1); \ } \ \ template \ [[nodiscard]] constexpr auto operator a_op##a_op(enumeration& a_lhs, int) noexcept \ - -> enumeration \ + ->enumeration \ { \ const auto tmp = a_lhs; \ a_op##a_op a_lhs; \ diff --git a/CommonLibF4/include/RE/Bethesda/BSExtraData.h b/CommonLibF4/include/RE/Bethesda/BSExtraData.h index c05bba78..d0523ce5 100644 --- a/CommonLibF4/include/RE/Bethesda/BSExtraData.h +++ b/CommonLibF4/include/RE/Bethesda/BSExtraData.h @@ -70,7 +70,7 @@ namespace RE kLock, // ExtraLock kTeleport, // ExtraTeleport kMapMarker, - kLeveledCreature, // ExtraLeveledCreature + kLeveledCreature, // ExtraLeveledCreature kLevelItem, kScale, kSeed, diff --git a/CommonLibF4/include/RE/Bethesda/Events.h b/CommonLibF4/include/RE/Bethesda/Events.h index f6088062..f503ffa2 100644 --- a/CommonLibF4/include/RE/Bethesda/Events.h +++ b/CommonLibF4/include/RE/Bethesda/Events.h @@ -623,7 +623,7 @@ namespace RE } // members - std::uint32_t formID; // 00 + std::uint32_t formID; // 00 }; static_assert(sizeof(TESFormDeleteEvent) == 0x04);