Skip to content

Commit 68316e8

Browse files
authored
Merge pull request #201 from elbeno/fix-clang-format
👽 Fix clang-format changes from upstream
2 parents ec95cd6 + a5394a4 commit 68316e8

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

include/stdx/atomic_bitset.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#pragma once
22

3-
#include <conc/atomic.hpp>
4-
53
#include <stdx/bit.hpp>
64
#include <stdx/bitset.hpp>
75
#include <stdx/compiler.hpp>
@@ -11,6 +9,8 @@
119
#include <stdx/type_traits.hpp>
1210
#include <stdx/udls.hpp>
1311

12+
#include <conc/atomic.hpp>
13+
1414
#include <algorithm>
1515
#include <atomic>
1616
#include <cstddef>

include/stdx/rollover.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ template <typename T> struct rollover_t {
7575
return not(lhs == rhs);
7676
}
7777

78-
constexpr friend auto operator<(rollover_t, rollover_t) -> bool = delete;
79-
constexpr friend auto operator<=(rollover_t, rollover_t) -> bool = delete;
80-
constexpr friend auto operator>(rollover_t, rollover_t) -> bool = delete;
81-
constexpr friend auto operator>=(rollover_t, rollover_t) -> bool = delete;
78+
friend constexpr auto operator<(rollover_t, rollover_t) -> bool = delete;
79+
friend constexpr auto operator<=(rollover_t, rollover_t) -> bool = delete;
80+
friend constexpr auto operator>(rollover_t, rollover_t) -> bool = delete;
81+
friend constexpr auto operator>=(rollover_t, rollover_t) -> bool = delete;
8282

8383
[[nodiscard]] constexpr friend auto cmp_less(rollover_t lhs, rollover_t rhs)
8484
-> bool {

include/stdx/tuple.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ template <typename... Ts>
499499
class one_of : public detail::tuple_impl<std::index_sequence_for<Ts...>,
500500
detail::index_function_list<>, Ts...> {
501501
template <typename T>
502-
constexpr friend auto operator==(one_of const &lhs, T const &rhs) -> bool {
502+
friend constexpr auto operator==(one_of const &lhs, T const &rhs) -> bool {
503503
return lhs.apply(
504504
[&](auto &&...args) { return ((args == rhs) || ...); });
505505
}

test/fail/tuple_equality_with_element.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// EXPECT: deleted
44

55
struct S {
6-
constexpr friend auto operator==(S, S) -> bool = default;
6+
friend constexpr auto operator==(S, S) -> bool = default;
77
};
88

99
auto main() -> int {

test/optional.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ enum struct E : std::uint8_t { VALUE, ALT_VALUE };
1414

1515
struct S {
1616
constexpr explicit S(int i) : value{i} {}
17-
constexpr friend auto operator==(S const &x, S const &y) -> bool {
17+
friend constexpr auto operator==(S const &x, S const &y) -> bool {
1818
return x.value == y.value;
1919
}
20-
constexpr friend auto operator<(S const &x, S const &y) -> bool {
20+
friend constexpr auto operator<(S const &x, S const &y) -> bool {
2121
return x.value < y.value;
2222
}
2323
int value{};
@@ -332,7 +332,7 @@ struct move_only {
332332
constexpr move_only(int i) : value{i} {}
333333
constexpr move_only(move_only &&) = default;
334334
int value{};
335-
constexpr friend auto operator==(move_only const &x, move_only const &y)
335+
friend constexpr auto operator==(move_only const &x, move_only const &y)
336336
-> bool {
337337
return x.value == y.value;
338338
}
@@ -342,7 +342,7 @@ struct non_movable {
342342
constexpr non_movable(int i) : value{i} {}
343343
constexpr non_movable(non_movable &&) = delete;
344344
int value{};
345-
constexpr friend auto operator==(non_movable const &x, non_movable const &y)
345+
friend constexpr auto operator==(non_movable const &x, non_movable const &y)
346346
-> bool {
347347
return x.value == y.value;
348348
}

test/tuple_algorithms.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ TEST_CASE("fold_left (heterogeneous types in fold)", "[tuple_algorithms]") {
337337
}
338338

339339
template <auto N> struct addend {
340-
constexpr friend auto operator==(addend, addend) -> bool { return true; }
340+
friend constexpr auto operator==(addend, addend) -> bool { return true; }
341341
};
342342
template <auto X, auto Y> constexpr auto operator+(addend<X>, addend<Y>) {
343343
return addend<X + Y>{};

0 commit comments

Comments
 (0)