Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pre-commit.ci] pre-commit autoupdate #268

Merged
merged 2 commits into from
Oct 23, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
pre-commit-ci[bot] committed Oct 16, 2023

Verified

This commit was signed with the committer’s verified signature.
commit b110ba85e2df25862d1af53dbc6c7239a2af3b71
14 changes: 7 additions & 7 deletions include/proxsuite/helpers/tl-optional.hpp
Original file line number Diff line number Diff line change
@@ -640,9 +640,9 @@ struct optional_copy_assign_base<T, false> : optional_move_base<T>
// move assignable
#ifndef TL_OPTIONAL_GCC49
template<class T,
bool = std::is_trivially_destructible<T>::value&&
std::is_trivially_move_constructible<T>::value&&
std::is_trivially_move_assignable<T>::value>
bool = std::is_trivially_destructible<T>::value &&
std::is_trivially_move_constructible<T>::value &&
std::is_trivially_move_assignable<T>::value>
struct optional_move_assign_base : optional_copy_assign_base<T>
{
using optional_copy_assign_base<T>::optional_copy_assign_base;
@@ -667,8 +667,8 @@ struct optional_move_assign_base<T, false> : optional_copy_assign_base<T>

optional_move_assign_base&
operator=(optional_move_assign_base&& rhs) noexcept(
std::is_nothrow_move_constructible<T>::value&&
std::is_nothrow_move_assignable<T>::value)
std::is_nothrow_move_constructible<T>::value &&
std::is_nothrow_move_assignable<T>::value)
{
this->assign(std::move(rhs));
return *this;
@@ -1461,8 +1461,8 @@ class optional
/// If one has a value, it is moved to the other and the movee is left
/// valueless.
void swap(optional& rhs) noexcept(
std::is_nothrow_move_constructible<T>::value&&
detail::is_nothrow_swappable<T>::value)
std::is_nothrow_move_constructible<T>::value &&
detail::is_nothrow_swappable<T>::value)
{
using std::swap;
if (has_value()) {
3 changes: 2 additions & 1 deletion include/proxsuite/linalg/veg/internal/dyn_index.hpp
Original file line number Diff line number Diff line change
@@ -257,7 +257,8 @@ struct binary_traits<Dyn, Fix<N>> : binary_traits<Dyn, Dyn>
} // namespace _detail

inline namespace literals {
VEG_INLINE constexpr auto operator"" _v(unsigned long long n) VEG_NOEXCEPT->Dyn
VEG_INLINE constexpr auto
operator"" _v(unsigned long long n) VEG_NOEXCEPT->Dyn
{
return isize(n);
}
16 changes: 8 additions & 8 deletions include/proxsuite/linalg/veg/internal/external/hedley.ext.hpp
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@
#undef HEDLEY_VERSION_ENCODE
#endif
#define HEDLEY_VERSION_ENCODE(major, minor, revision) \
(((major)*1000000) + ((minor)*1000) + (revision))
(((major) * 1000000) + ((minor) * 1000) + (revision))

#if defined(HEDLEY_VERSION_DECODE_MAJOR)
#undef HEDLEY_VERSION_DECODE_MAJOR
@@ -194,7 +194,7 @@
#elif defined(__SUNPRO_C)
#define HEDLEY_SUNPRO_VERSION \
HEDLEY_VERSION_ENCODE( \
(__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C)&0xf)
(__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf)
#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000)
#define HEDLEY_SUNPRO_VERSION \
HEDLEY_VERSION_ENCODE( \
@@ -204,7 +204,7 @@
#elif defined(__SUNPRO_CC)
#define HEDLEY_SUNPRO_VERSION \
HEDLEY_VERSION_ENCODE( \
(__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC)&0xf)
(__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf)
#endif

#if defined(HEDLEY_SUNPRO_VERSION_CHECK)
@@ -1817,12 +1817,12 @@ HEDLEY_DIAGNOSTIC_POP
#if defined(__INTPTR_TYPE__)
#define HEDLEY_IS_CONSTEXPR_(expr) \
__builtin_types_compatible_p( \
__typeof__((1 ? (void*)((__INTPTR_TYPE__)((expr)*0)) : (int*)0)), int*)
__typeof__((1 ? (void*)((__INTPTR_TYPE__)((expr) * 0)) : (int*)0)), int*)
#else
#include <stdint.h>
#define HEDLEY_IS_CONSTEXPR_(expr) \
__builtin_types_compatible_p( \
__typeof__((1 ? (void*)((intptr_t)((expr)*0)) : (int*)0)), int*)
__typeof__((1 ? (void*)((intptr_t)((expr) * 0)) : (int*)0)), int*)
#endif
#elif (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && \
!defined(HEDLEY_SUNPRO_VERSION) && !defined(HEDLEY_PGI_VERSION) && \
@@ -1832,13 +1832,13 @@ HEDLEY_DIAGNOSTIC_POP
HEDLEY_IBM_VERSION_CHECK(12, 1, 0) || HEDLEY_ARM_VERSION_CHECK(5, 3, 0)
#if defined(__INTPTR_TYPE__)
#define HEDLEY_IS_CONSTEXPR_(expr) \
_Generic((1 ? (void*)((__INTPTR_TYPE__)((expr)*0)) : (int*)0), \
_Generic((1 ? (void*)((__INTPTR_TYPE__)((expr) * 0)) : (int*)0), \
int*: 1, \
void*: 0)
#else
#include <stdint.h>
#define HEDLEY_IS_CONSTEXPR_(expr) \
_Generic((1 ? (void*)((intptr_t)*0) : (int*)0), int*: 1, void*: 0)
_Generic((1 ? (void*)((intptr_t) * 0) : (int*)0), int*: 1, void*: 0)
#endif
#elif defined(HEDLEY_GCC_VERSION) || defined(HEDLEY_INTEL_VERSION) || \
defined(HEDLEY_TINYC_VERSION) || defined(HEDLEY_TI_ARMCL_VERSION) || \
@@ -1847,7 +1847,7 @@ HEDLEY_DIAGNOSTIC_POP
defined(HEDLEY_TI_CL7X_VERSION) || defined(HEDLEY_TI_CLPRU_VERSION) || \
defined(__clang__)
#define HEDLEY_IS_CONSTEXPR_(expr) \
(sizeof(void) != sizeof(*(1 ? ((void*)((expr)*0L)) \
(sizeof(void) != sizeof(*(1 ? ((void*)((expr) * 0L)) \
: ((struct { char v[sizeof(void) * 2]; }*)1))))
#endif
#endif
3 changes: 2 additions & 1 deletion include/proxsuite/linalg/veg/internal/fix_index.hpp
Original file line number Diff line number Diff line change
@@ -325,7 +325,8 @@ namespace adl {

inline namespace literals {
template<char... Chars>
VEG_INLINE constexpr auto operator"" _c() VEG_NOEXCEPT
VEG_INLINE constexpr auto
operator"" _c() VEG_NOEXCEPT
{
return Fix<_detail::parse_int(
_detail::char_seq<Chars...>::value, sizeof...(Chars), _detail::Error{})>{};
8 changes: 4 additions & 4 deletions include/proxsuite/linalg/veg/internal/prologue.hpp
Original file line number Diff line number Diff line change
@@ -55,15 +55,15 @@
~Class() = default; \
Class(Class&&) = default; \
explicit Class(Class const&) = default; \
auto operator=(Class&&)&->Class& = default; \
auto operator=(Class const&)&->Class& = default
auto operator=(Class&&)& -> Class& = default; \
auto operator=(Class const&)& -> Class& = default

#define VEG_NO_COPY(Class) \
~Class() = default; \
Class(Class&&) = default; \
Class(Class const&) = delete; \
auto operator=(Class&&)&->Class& = default; \
auto operator=(Class const&)&->Class& = delete
auto operator=(Class&&)& -> Class& = default; \
auto operator=(Class const&)& -> Class& = delete

#ifdef VEG_WITH_CXX14_SUPPORT
#define VEG_CPP14(...) __VA_ARGS__
4 changes: 2 additions & 2 deletions include/proxsuite/proxqp/dense/views.hpp
Original file line number Diff line number Diff line change
@@ -53,8 +53,8 @@ struct FnInfo<auto(Args...)->Ret_>
template auto __VA_ARGS__( \
LDLT_IMPL_GET_PARAMS(NParams, __VA_ARGS__) \
typename ::proxsuite::proxqp::detail::FnInfo< \
decltype(__VA_ARGS__)>::template Arg<(NParams)-1>) \
->typename ::proxsuite::proxqp::detail::FnInfo<decltype(__VA_ARGS__)>::Ret
decltype(__VA_ARGS__)>::template Arg<(NParams)-1>) -> \
typename ::proxsuite::proxqp::detail::FnInfo<decltype(__VA_ARGS__)>::Ret
#define LDLT_EXPLICIT_TPL_DECL(NParams, ...) \
extern LDLT_EXPLICIT_TPL_DEF(NParams, __VA_ARGS__)

2 changes: 1 addition & 1 deletion test/doctest/doctest.hpp
Original file line number Diff line number Diff line change
@@ -85,7 +85,7 @@
#endif

#define DOCTEST_COMPILER(MAJOR, MINOR, PATCH) \
((MAJOR)*10000000 + (MINOR)*100000 + (PATCH))
((MAJOR) * 10000000 + (MINOR) * 100000 + (PATCH))

// GCC/Clang and GCC/MSVC are mutually exclusive, but Clang/MSVC are not because
// of clang-cl...