Skip to content

Fix external swap requirements #27

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.

Sign up for GitHub

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

Merged
gharveymn merged 2 commits into from
Apr 27, 2025
Merged

Fix external swap requirements #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ab7d3b
External swap should require `MoveAssignable`
gharveymn Apr 27, 2025
00d7a63
Add unequal InlineCapacity to README
gharveymn Apr 27, 2025
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
18 changes: 18 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,17 @@ namespace gch
)
&& InlineCapacity == 0
)

template <unsigned I>
constexpr
void
swap (small_vector& other)
requires (MoveInsertable && MoveAssignable && Swappable)
|| ( ( std::is_same<std::allocator<value_type>, Allocator>::value
|| std::allocator_traits<Allocator>::propagate_on_container_swap::value
|| std::allocator_traits<Allocator>::is_always_equal::value
)
)

/* iteration */
constexpr iterator begin (void) noexcept;
Expand Down Expand Up @@ -678,6 +689,13 @@ namespace gch
small_vector<T, InlineCapacity, Allocator>& rhs)
noexcept (noexcept (lhs.swap (rhs)))
requires MoveInsertable && Swappable;

template <typename T, unsigned InlineCapacityLHS, unsigned InlineCapacityRHS, typename Allocator>
constexpr
void
swap (small_vector<T, InlineCapacityLHS, Allocator>& lhs,
small_vector<T, InlineCapacityRHS, Allocator>& rhs)
requires MoveInsertable && Swappable;

template <typename T, unsigned InlineCapacity, typename Allocator, typename U>
constexpr
Expand Down
9 changes: 6 additions & 3 deletions source/include/gch/small_vector.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6297,13 +6297,14 @@ namespace gch
noexcept (noexcept (lhs.swap (rhs)))
#ifdef GCH_LIB_CONCEPTS
requires concepts::MoveInsertable<T, small_vector<T, InlineCapacity, Allocator>, Allocator>
&& concepts::MoveAssignable<T>
&& concepts::Swappable<T>
#endif
{
lhs.swap (rhs);
}

template <typename T, unsigned M, unsigned N, typename Allocator
template <typename T, unsigned InlineCapacityLHS, unsigned InlineCapacityRHS, typename Allocator
#ifndef GCH_LIB_CONCEPTS
, typename std::enable_if<std::is_move_constructible<T>::value
&& std::is_move_assignable<T>::value
Expand All @@ -6315,10 +6316,12 @@ namespace gch
>
inline GCH_CPP20_CONSTEXPR
void
swap (small_vector<T, M, Allocator>& lhs, small_vector<T, N, Allocator>& rhs)
swap (small_vector<T, InlineCapacityLHS, Allocator>& lhs,
small_vector<T, InlineCapacityRHS, Allocator>& rhs)
noexcept (noexcept (lhs.swap (rhs)))
#ifdef GCH_LIB_CONCEPTS
requires concepts::MoveInsertable<T, small_vector<T, M, Allocator>, Allocator>
requires concepts::MoveInsertable<T, small_vector<T, InlineCapacityLHS, Allocator>, Allocator>
&& concepts::MoveAssignable<T>
&& concepts::Swappable<T>
#endif
{
Expand Down