Containers: Help type deduction for toSpan() and toSpanConst()

Pagghiu · Aug 25, 2024 · 9a0a5aa · 9a0a5aa
1 parent a7c64cc
commit 9a0a5aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Libraries/Containers/Array.h b/Libraries/Containers/Array.h
@@ -100,11 +100,11 @@ struct SC::Array
 
     /// @brief Returns a Span wrapping the entire of current array
     /// @return a Span wrapping the entire of current array
-    [[nodiscard]] Span<const T> toSpanConst() const SC_LANGUAGE_LIFETIME_BOUND { return {items, size()}; }
+    [[nodiscard]] Span<const T> toSpanConst() const SC_LANGUAGE_LIFETIME_BOUND { return Span<const T>(items, size()); }
 
     /// @brief Returns a Span wrapping the entire of current array
     /// @return a Span wrapping the entire of current array
-    [[nodiscard]] Span<T> toSpan() SC_LANGUAGE_LIFETIME_BOUND { return {items, size()}; }
+    [[nodiscard]] Span<T> toSpan() SC_LANGUAGE_LIFETIME_BOUND { return Span<T>(items, size()); }
 
     /// @brief Access item at index. Bounds checked in debug.
     /// @param index index of the item to be accessed
@@ -370,7 +370,7 @@ SC::Array<T, N>::Array(const Array& other)
 {
     segmentHeader.sizeBytes     = 0;
     segmentHeader.capacityBytes = sizeof(T) * N;
-    (void)append({other.items, other.size()});
+    (void)append(other.toSpanConst());
 }
 
 template <typename T, int N>

diff --git a/Libraries/Containers/Vector.h b/Libraries/Containers/Vector.h
@@ -91,11 +91,11 @@ struct SC::Vector
 
     /// @brief Returns a Span wrapping the entire of current vector
     /// @return a Span wrapping the entire of current vector
-    [[nodiscard]] Span<const T> toSpanConst() const SC_LANGUAGE_LIFETIME_BOUND { return {items, size()}; }
+    [[nodiscard]] Span<const T> toSpanConst() const SC_LANGUAGE_LIFETIME_BOUND { return Span<const T>(items, size()); }
 
     /// @brief Returns a Span wrapping the entire of current vector
     /// @return a Span wrapping the entire of current vector
-    [[nodiscard]] Span<T> toSpan() SC_LANGUAGE_LIFETIME_BOUND { return {items, size()}; }
+    [[nodiscard]] Span<T> toSpan() SC_LANGUAGE_LIFETIME_BOUND { return Span<T>(items, size()); }
 
     /// @brief Access item at index. Bounds checked in debug.
     /// @param index index of the item to be accessed