Skip to content

Commit

Permalink
Containers: Fix compile errors under latest MSVC
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pagghiu
Pagghiu committed Sep 9, 2024
1 parent 9a0a5aa commit a572d89
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 47 deletions.
10 changes: 6 additions & 4 deletions Libraries/Containers/Array.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -500,15 +500,17 @@ bool SC::Array<T, N>::pop_front()
template <typename T, int N>
bool SC::Array<T, N>::resize(size_t newSize, const T& value)
{
T* oldItems = items;
return Operations::template resizeInternal<true>(oldItems, newSize, &value);
T* oldItems = items;
static constexpr bool IsTrivial = TypeTraits::IsTriviallyCopyable<T>::value;
return Operations::template resizeInternal<IsTrivial, true>(oldItems, newSize, &value);
}

template <typename T, int N>
bool SC::Array<T, N>::resizeWithoutInitializing(size_t newSize)
{
T* oldItems = items;
return Operations::template resizeInternal<false>(oldItems, newSize, nullptr);
T* oldItems = items;
static constexpr bool IsTrivial = TypeTraits::IsTriviallyCopyable<T>::value;
return Operations::template resizeInternal<IsTrivial, false>(oldItems, newSize, nullptr);
}

template <typename T, int N>
Expand Down
91 changes: 50 additions & 41 deletions Libraries/Containers/Internal/Segment.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,31 +110,33 @@ struct SC::SegmentItems : public SegmentHeader
static typename TypeTraits::EnableIf<not IsCopy, void>::type constructItems(U* destination, size_t indexStart,
size_t numElements, U* sourceValue);

template <typename Q = T>
static typename TypeTraits::EnableIf<not TypeTraits::IsTriviallyCopyable<Q>::value, void>::type //
moveItems(T* oldItems, T* newItems, const size_t oldSize, const size_t keepFirstN);

template <typename Q = T>
static typename TypeTraits::EnableIf<TypeTraits::IsTriviallyCopyable<Q>::value, void>::type //
moveItems(T* oldItems, T* newItems, const size_t oldSize, const size_t keepFirstN);

template <typename U, typename Q = T>
static typename TypeTraits::EnableIf<not TypeTraits::IsTriviallyCopyable<Q>::value, void>::type //
template <bool IsTrivial>
static typename TypeTraits::EnableIf<IsTrivial, void>::type moveItems(T* oldItems, T* newItems,
const size_t oldSize,
const size_t keepFirstN);

template <bool IsTrivial>
static typename TypeTraits::EnableIf<not IsTrivial, void>::type moveItems(T* oldItems, T* newItems,
const size_t oldSize,
const size_t keepFirstN);

template <bool IsTrivial, typename U>
static typename TypeTraits::EnableIf<not IsTrivial, void>::type //
copyItems(T* oldItems, const size_t numToAssign, const size_t numToCopyConstruct, const size_t numToDestroy,
U* other, size_t otherSize);

template <typename U, typename Q = T>
static typename TypeTraits::EnableIf<TypeTraits::IsTriviallyCopyable<Q>::value, void>::type //
template <bool IsTrivial, typename U>
static typename TypeTraits::EnableIf<IsTrivial, void>::type //
copyItems(T* oldItems, const size_t numToAssign, const size_t numToCopyConstruct, const size_t numToDestroy,
U* other, size_t otherSize);

template <bool IsCopy, typename U, typename Q = T>
static typename TypeTraits::EnableIf<not TypeTraits::IsTriviallyCopyable<Q>::value, void>::type //
template <bool IsTrivial, bool IsCopy, typename U>
static typename TypeTraits::EnableIf<not IsTrivial, void>::type //
insertItems(T*& oldItems, size_t position, const size_t numElements, const size_t newSize, U* other,
size_t otherSize);

template <bool IsCopy, typename U, typename Q = T>
static typename TypeTraits::EnableIf<TypeTraits::IsTriviallyCopyable<U>::value, void>::type //
template <bool IsTrivial, bool IsCopy, typename U>
static typename TypeTraits::EnableIf<IsTrivial, void>::type //
insertItems(T*& oldItems, size_t position, const size_t numElements, const size_t newSize, U* other,
size_t otherSize);

Expand Down Expand Up @@ -174,12 +176,12 @@ struct SC::SegmentOperations

[[nodiscard]] static bool ensureCapacity(T*& oldItems, size_t newCapacity, const size_t keepFirstN);

template <bool initialize, typename Q = T>
[[nodiscard]] static typename TypeTraits::EnableIf<TypeTraits::IsTriviallyCopyable<Q>::value, bool>::type //
template <bool IsTrivial, bool initialize>
[[nodiscard]] static typename TypeTraits::EnableIf<IsTrivial, bool>::type //
resizeInternal(T*& oldItems, size_t newSize, const T* defaultValue);

template <bool initialize, typename Q = T>
[[nodiscard]] static typename TypeTraits::EnableIf<not TypeTraits::IsTriviallyCopyable<Q>::value, bool>::type //
template <bool IsTrivial, bool initialize>
[[nodiscard]] static typename TypeTraits::EnableIf<not IsTrivial, bool>::type //
resizeInternal(T*& oldItems, size_t newSize, const T* defaultValue);

[[nodiscard]] static bool shrink_to_fit(T*& oldItems);
Expand Down Expand Up @@ -274,17 +276,17 @@ SC::SegmentItems<T>::constructItems(U* destination, size_t indexStart, size_t nu
}

template <typename T>
template <typename Q>
typename SC::TypeTraits::EnableIf<not SC::TypeTraits::IsTriviallyCopyable<Q>::value, void>::type //
template <bool IsTrivial>
typename SC::TypeTraits::EnableIf<not IsTrivial, void>::type //
SC::SegmentItems<T>::moveItems(T* oldItems, T* newItems, const size_t oldSize, const size_t keepFirstN)
{
moveConstruct(newItems, 0, keepFirstN, oldItems);
destruct(oldItems, keepFirstN, oldSize - keepFirstN);
}

template <typename T>
template <typename Q>
typename SC::TypeTraits::EnableIf<SC::TypeTraits::IsTriviallyCopyable<Q>::value, void>::type //
template <bool IsTrivial>
typename SC::TypeTraits::EnableIf<IsTrivial, void>::type //
SC::SegmentItems<T>::moveItems(T* oldItems, T* newItems, const size_t oldSize, const size_t keepFirstN)
{
SC_COMPILER_UNUSED(oldSize);
Expand All @@ -293,8 +295,8 @@ SC::SegmentItems<T>::moveItems(T* oldItems, T* newItems, const size_t oldSize, c
}

template <typename T>
template <typename U, typename Q>
typename SC::TypeTraits::EnableIf<not SC::TypeTraits::IsTriviallyCopyable<Q>::value, void>::type //
template <bool IsTrivial, typename U>
typename SC::TypeTraits::EnableIf<not IsTrivial, void>::type //
SC::SegmentItems<T>::copyItems(T* oldItems, const size_t numToAssign, const size_t numToCopyConstruct,
const size_t numToDestroy, U* other, size_t otherSize)
{
Expand All @@ -305,8 +307,8 @@ SC::SegmentItems<T>::copyItems(T* oldItems, const size_t numToAssign, const size
}

template <typename T>
template <typename U, typename Q>
typename SC::TypeTraits::EnableIf<SC::TypeTraits::IsTriviallyCopyable<Q>::value, void>::type //
template <bool IsTrivial, typename U>
typename SC::TypeTraits::EnableIf<IsTrivial, void>::type //
SC::SegmentItems<T>::copyItems(T* oldItems, const size_t numToAssign, const size_t numToCopyConstruct,
const size_t numToDestroy, U* other, size_t otherSize)
{
Expand All @@ -318,8 +320,8 @@ SC::SegmentItems<T>::copyItems(T* oldItems, const size_t numToAssign, const size
}

template <typename T>
template <bool IsCopy, typename U, typename Q>
typename SC::TypeTraits::EnableIf<not SC::TypeTraits::IsTriviallyCopyable<Q>::value, void>::type //
template <bool IsTrivial, bool IsCopy, typename U>
typename SC::TypeTraits::EnableIf<not IsTrivial, void>::type //
SC::SegmentItems<T>::insertItems(T*& oldItems, size_t position, const size_t numElements, const size_t newSize,
U* other, size_t otherSize)
{
Expand All @@ -330,8 +332,8 @@ SC::SegmentItems<T>::insertItems(T*& oldItems, size_t position, const size_t num
}

template <typename T>
template <bool IsCopy, typename U, typename Q>
typename SC::TypeTraits::EnableIf<SC::TypeTraits::IsTriviallyCopyable<U>::value, void>::type //
template <bool IsTrivial, bool IsCopy, typename U>
typename SC::TypeTraits::EnableIf<IsTrivial, void>::type //
SC::SegmentItems<T>::insertItems(T*& oldItems, size_t position, const size_t numElements, const size_t newSize,
U* other, size_t otherSize)
{
Expand Down Expand Up @@ -490,7 +492,10 @@ bool SC::SegmentOperations<Allocator, T>::assign(T*& oldItems, U* other, size_t
const size_t numToAssign = min(numElements, otherSize);
const size_t numToCopyConstruct = otherSize > numElements ? otherSize - numElements : 0;
const size_t numToDestroy = numElements > otherSize ? numElements - otherSize : 0;
SegmentItems<T>::copyItems(oldItems, numToAssign, numToCopyConstruct, numToDestroy, other, otherSize);

static constexpr bool IsTrivial = TypeTraits::IsTriviallyCopyable<T>::value;
SegmentItems<T>::template copyItems<IsTrivial>(oldItems, numToAssign, numToCopyConstruct, numToDestroy, other,
otherSize);
SegmentItems<T>::getSegment(oldItems)->setSize(otherSize);
return true;
}
Expand Down Expand Up @@ -536,8 +541,10 @@ bool SC::SegmentOperations<Allocator, T>::insert(T*& oldItems, size_t position,
}
}
// Segment may have been reallocated
selfSegment = SegmentItems<T>::getSegment(oldItems);
SegmentItems<T>::template insertItems<IsCopy, U, T>(oldItems, position, numElements, newSize, other, otherSize);
selfSegment = SegmentItems<T>::getSegment(oldItems);
static constexpr bool IsTrivial = TypeTraits::IsTriviallyCopyable<T>::value;
SegmentItems<T>::template insertItems<IsTrivial, IsCopy>(oldItems, position, numElements, newSize, other,
otherSize);
selfSegment->setSize(newSize);
return true;
}
Expand Down Expand Up @@ -566,8 +573,10 @@ bool SC::SegmentOperations<Allocator, T>::ensureCapacity(T*& oldItems, size_t ne
newSegment->setSize(oldSize);
if (oldSize > 0)
{
SegmentItems<T>::moveItems(Allocator::template getItems<T>(oldSegment),
Allocator::template getItems<T>(newSegment), oldSize, keepFirstN);
static constexpr bool IsTrivial = TypeTraits::IsTriviallyCopyable<T>::value;
SegmentItems<T>::template moveItems<IsTrivial>(Allocator::template getItems<T>(oldSegment),
Allocator::template getItems<T>(newSegment), oldSize,
keepFirstN);
}
if (oldSegment != nullptr)
{
Expand All @@ -578,8 +587,8 @@ bool SC::SegmentOperations<Allocator, T>::ensureCapacity(T*& oldItems, size_t ne
}

template <typename Allocator, typename T>
template <bool initialize, typename Q>
typename SC::TypeTraits::EnableIf<SC::TypeTraits::IsTriviallyCopyable<Q>::value, bool>::type //
template <bool IsTrivial, bool initialize>
typename SC::TypeTraits::EnableIf<IsTrivial, bool>::type //
SC::SegmentOperations<Allocator, T>::resizeInternal(T*& oldItems, size_t newSize, const T* defaultValue)
{
const auto oldSize = oldItems == nullptr ? 0 : SegmentItems<T>::getSegment(oldItems)->size();
Expand All @@ -599,8 +608,8 @@ SC::SegmentOperations<Allocator, T>::resizeInternal(T*& oldItems, size_t newSize
}

template <typename Allocator, typename T>
template <bool initialize, typename Q>
typename SC::TypeTraits::EnableIf<not SC::TypeTraits::IsTriviallyCopyable<Q>::value, bool>::type //
template <bool IsTrivial, bool initialize>
typename SC::TypeTraits::EnableIf<not IsTrivial, bool>::type //
SC::SegmentOperations<Allocator, T>::resizeInternal(T*& oldItems, size_t newSize, const T* defaultValue)
{
static_assert(initialize, "There is no logical reason to skip initializing non trivially copyable class on resize");
Expand Down
6 changes: 4 additions & 2 deletions Libraries/Containers/Vector.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,13 +468,15 @@ bool SC::Vector<T>::reserve(size_t newCapacity)
template <typename T>
bool SC::Vector<T>::resize(size_t newSize, const T& value)
{
return Operations::template resizeInternal<true>(items, newSize, &value);
static constexpr bool IsTrivial = TypeTraits::IsTriviallyCopyable<T>::value;
return Operations::template resizeInternal<IsTrivial, true>(items, newSize, &value);
}

template <typename T>
bool SC::Vector<T>::resizeWithoutInitializing(size_t newSize)
{
return Operations::template resizeInternal<false>(items, newSize, nullptr);
static constexpr bool IsTrivial = TypeTraits::IsTriviallyCopyable<T>::value;
return Operations::template resizeInternal<IsTrivial, false>(items, newSize, nullptr);
}

template <typename T>
Expand Down

0 comments on commit a572d89

Please sign in to comment.