Merge branch 'master' into vtk-components

1 files changed, 22 insertions, 8 deletions

diff --git a/toolsrc/include/Span.h b/toolsrc/include/Span.h
index b16af2cef..a43e8f992 100644
--- a/toolsrc/include/Span.h
+++ b/toolsrc/include/Span.h
@@ -2,10 +2,11 @@
 

 #include <array>

 #include <cstddef>

+#include <initializer_list>

 #include <vector>

 

 template<class T>

-struct span

+struct Span

 {

 public:

     using element_type = T;

@@ -13,18 +14,19 @@ public:
     using reference = T&;

     using iterator = T*;

 

-    constexpr span() noexcept : m_ptr(nullptr), m_count(0) {}

-    constexpr span(std::nullptr_t) noexcept : span() {}

-    constexpr span(T* ptr, size_t count) noexcept : m_ptr(ptr), m_count(count) {}

-    constexpr span(T* ptr_begin, T* ptr_end) noexcept : m_ptr(ptr_begin), m_count(ptr_end - ptr_begin) {}

+    constexpr Span() noexcept : m_ptr(nullptr), m_count(0) {}

+    constexpr Span(std::nullptr_t) noexcept : Span() {}

+    constexpr Span(T* ptr, size_t count) noexcept : m_ptr(ptr), m_count(count) {}

+    constexpr Span(T* ptr_begin, T* ptr_end) noexcept : m_ptr(ptr_begin), m_count(ptr_end - ptr_begin) {}

+    constexpr Span(std::initializer_list<T> l) noexcept : m_ptr(l.begin()), m_count(l.size()) {}

 

     template<size_t N>

-    constexpr span(T (&arr)[N]) noexcept : span(arr, N)

+    constexpr Span(T (&arr)[N]) noexcept : Span(arr, N)

     {

     }

 

-    span(std::vector<T>& v) noexcept : span(v.data(), v.size()) {}

-    span(const std::vector<std::remove_const_t<T>>& v) noexcept : span(v.data(), v.size()) {}

+    Span(std::vector<T>& v) noexcept : Span(v.data(), v.size()) {}

+    Span(const std::vector<std::remove_const_t<T>>& v) noexcept : Span(v.data(), v.size()) {}

 

     constexpr iterator begin() const { return m_ptr; }

     constexpr iterator end() const { return m_ptr + m_count; }

@@ -36,3 +38,15 @@ private:
     pointer m_ptr;

     size_t m_count;

 };

+

+template<class T>

+Span<T> make_span(std::vector<T>& v)

+{

+    return {v.data(), v.size()};

+}

+

+template<class T>

+Span<const T> make_span(const std::vector<T>& v)

+{

+    return {v.data(), v.size()};

+}