Skip to content

Commit 63ebc85

Browse files
committed
Adjust TEST_CONSTEXPR
1 parent f846c2a commit 63ebc85

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

libcxx/test/std/containers/sequences/vector/trivial_relocation.pass.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ struct Tracker {
2424
};
2525

2626
struct [[clang::trivial_abi]] Inner {
27-
TEST_CONSTEXPR explicit Inner(Tracker* tracker) : tracker_(tracker) {}
28-
TEST_CONSTEXPR Inner(const Inner& rhs) : tracker_(rhs.tracker_) { tracker_->move_constructs += 1; }
29-
TEST_CONSTEXPR Inner(Inner&& rhs) : tracker_(rhs.tracker_) { tracker_->move_constructs += 1; }
27+
TEST_CONSTEXPR_CXX20 explicit Inner(Tracker* tracker) : tracker_(tracker) {}
28+
TEST_CONSTEXPR_CXX20 Inner(const Inner& rhs) : tracker_(rhs.tracker_) { tracker_->move_constructs += 1; }
29+
TEST_CONSTEXPR_CXX20 Inner(Inner&& rhs) : tracker_(rhs.tracker_) { tracker_->move_constructs += 1; }
3030
Tracker* tracker_;
3131
};
3232

3333
// Even though this type contains a trivial_abi type, it is not trivially move-constructible,
3434
// so we should not attempt to optimize its move construction + destroy using trivial relocation.
3535
struct NotTriviallyMovable {
36-
TEST_CONSTEXPR explicit NotTriviallyMovable(Tracker* tracker) : inner_(tracker) {}
37-
TEST_CONSTEXPR NotTriviallyMovable(NotTriviallyMovable&& other) : inner_(std::move(other.inner_)) {}
36+
TEST_CONSTEXPR_CXX20 explicit NotTriviallyMovable(Tracker* tracker) : inner_(tracker) {}
37+
TEST_CONSTEXPR_CXX20 NotTriviallyMovable(NotTriviallyMovable&& other) : inner_(std::move(other.inner_)) {}
3838
Inner inner_;
3939
};
4040
static_assert(!std::is_trivially_copyable<NotTriviallyMovable>::value, "");

0 commit comments

Comments
 (0)