Skip to content

Commit 1c6e711

Browse files
committed
immobile -> nonmovable
1 parent 332f8e1 commit 1c6e711

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

libcxx/test/std/concepts/concepts.compare/concept.equalitycomparable/equality_comparable_with.compile.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1125,5 +1125,5 @@ static_assert(!check_equality_comparable_with<move_only_equality_with_int, int>(
11251125
static_assert(!check_equality_comparable_with<std::unique_ptr<int>, std::nullptr_t>());
11261126
#endif // TEST_STD_VER >= 23
11271127

1128-
static_assert(!check_equality_comparable_with<immobile_equality_with_int, int>());
1128+
static_assert(!check_equality_comparable_with<nonmovable_equality_with_int, int>());
11291129
} // namespace types_fit_for_purpose

libcxx/test/std/language.support/cmp/cmp.concept/three_way_comparable_with.compile.pass.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -241,15 +241,15 @@ static_assert(check_three_way_comparable_with<MoveOnlyIntComparable, int>());
241241
static_assert(!check_three_way_comparable_with<MoveOnlyIntComparable, int>());
242242
#endif // TEST_STD_VER >= 23
243243

244-
struct ImmobileIntComparable {
245-
ImmobileIntComparable(int) {}
244+
struct NonMovableIntComparable {
245+
NonMovableIntComparable(int) {}
246246

247-
ImmobileIntComparable(ImmobileIntComparable&&) = delete;
248-
ImmobileIntComparable& operator=(ImmobileIntComparable&&) = delete;
247+
NonMovableIntComparable(NonMovableIntComparable&&) = delete;
248+
NonMovableIntComparable& operator=(NonMovableIntComparable&&) = delete;
249249

250-
friend auto operator<=>(ImmobileIntComparable const&, ImmobileIntComparable const&) = default;
250+
friend auto operator<=>(NonMovableIntComparable const&, NonMovableIntComparable const&) = default;
251251
};
252252

253-
static_assert(!check_three_way_comparable_with<ImmobileIntComparable, int>());
253+
static_assert(!check_three_way_comparable_with<NonMovableIntComparable, int>());
254254

255255
} // namespace user_defined

libcxx/test/support/compare_types.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -542,14 +542,14 @@ struct move_only_equality_with_int {
542542
friend bool operator==(move_only_equality_with_int const&, int);
543543
};
544544

545-
struct immobile_equality_with_int {
546-
immobile_equality_with_int(int);
545+
struct nonmovable_equality_with_int {
546+
nonmovable_equality_with_int(int);
547547

548-
immobile_equality_with_int(immobile_equality_with_int&&) = delete;
549-
immobile_equality_with_int& operator=(immobile_equality_with_int&&) = delete;
548+
nonmovable_equality_with_int(nonmovable_equality_with_int&&) = delete;
549+
nonmovable_equality_with_int& operator=(nonmovable_equality_with_int&&) = delete;
550550

551-
friend bool operator==(immobile_equality_with_int const&, immobile_equality_with_int const&) = default;
552-
friend bool operator==(immobile_equality_with_int const&, int);
551+
friend bool operator==(nonmovable_equality_with_int const&, nonmovable_equality_with_int const&) = default;
552+
friend bool operator==(nonmovable_equality_with_int const&, int);
553553
};
554554

555555
#endif // TEST_SUPPORT_COMPARE_TYPES_H

0 commit comments

Comments
 (0)