Skip to content

Fix gcc15 const T storage #97

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
JeffGarland merged 1 commit into from
Dec 29, 2025
Merged

Fix gcc15 const T storage #97

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 7 additions & 10 deletions include/beman/inplace_vector/inplace_vector.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,15 @@ template <class T, size_t N> struct trivial {
using size_type = smallest_size_t<N>;

private:
// If value_type is const, then const std::array of non-const elements:
using array_based_storage =
std::conditional_t<!std::is_const_v<T>, std::array<T, N>,
const std::array<std::remove_const_t<T>, N>>;
using array_based_storage = std::array<std::remove_const_t<T>, N>;
alignas(alignof(T)) array_based_storage storage_data_{};
size_type storage_size_ = 0;

protected:
constexpr const T *storage_data() const noexcept {
return storage_data_.data();
}
constexpr T *storage_data() noexcept { return storage_data_.data(); }
constexpr auto storage_data() noexcept { return storage_data_.data(); }
constexpr size_type storage_size() const noexcept { return storage_size_; }
constexpr void unsafe_set_size(size_t new_size) noexcept {
IV_EXPECT(size_type(new_size) <= N && "new_size out-of-bounds [0, N]");
Expand Down Expand Up @@ -161,17 +158,17 @@ template <class T, size_t N> struct non_trivial {
using size_type = smallest_size_t<N>;

private:
using byte_based_storage = std::conditional_t<
!std::is_const_v<T>, raw_byte_based_storage<T, N>,
const raw_byte_based_storage<std::remove_const_t<T>, N>>;
using byte_based_storage = raw_byte_based_storage<std::remove_const_t<T>, N>;
byte_based_storage storage_data_{}; // BUGBUG: test SIMD types
size_type storage_size_ = 0;

protected:
constexpr const T *storage_data() const noexcept {
return storage_data_.storage_data(0);
}
constexpr T *storage_data() noexcept { return storage_data_.storage_data(0); }
constexpr auto storage_data() noexcept {
return storage_data_.storage_data(0);
}
constexpr size_type storage_size() const noexcept { return storage_size_; }
constexpr void unsafe_set_size(size_t new_size) noexcept {
IV_EXPECT(size_type(new_size) <= N && "new_size out-of-bounds [0, N)");
Expand Down Expand Up @@ -323,7 +320,7 @@ struct inplace_vector_base : private storage::storage_for<T, N> {
requires(std::constructible_from<T, Args...>)
{
IV_EXPECT(size() < capacity() && "inplace_vector out-of-memory");
std::construct_at(end(), std::forward<Args>(args)...);
std::construct_at(storage_data() + size(), std::forward<Args>(args)...);
unsafe_set_size(size() + size_type(1));
return this->back();
}
Expand Down