span: allow ctr from vector to allow nonstandard allocators (#2533)

A couple other spots, too.
AcademySoftwareFoundation · Mar 31, 2020 · 8af51a9 · 8af51a9
1 parent e81036b
commit 8af51a9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/include/OpenImageIO/span.h b/src/include/OpenImageIO/span.h
@@ -97,14 +97,16 @@ class span {
     constexpr span (T (&data)[N]) : m_data(data), m_size(N) { }
 
     /// Construct from std::vector<T>.
-    constexpr span (std::vector<T> &v)
+    template<class Allocator>
+    constexpr span (std::vector<T, Allocator> &v)
         : m_data(v.size() ? &v[0] : nullptr), m_size(v.size()) {
     }
 
     /// Construct from `const std::vector<T>.` This turns
     /// `const std::vector<T>` into a `span<const T>` (the span isn't const,
     /// but the data it points to will be).
-    span (const std::vector<value_type> &v)
+    template<class Allocator>
+    span (const std::vector<value_type, Allocator> &v)
         : m_data(v.size() ? &v[0] : nullptr), m_size(v.size()) { }
 
     /// Construct from mutable element std::array
@@ -263,13 +265,15 @@ class span_strided {
     constexpr span_strided (T (&data)[N]) : span_strided(data,N,1) {}
 
     /// Construct from std::vector<T>.
-    OIIO_CONSTEXPR14 span_strided (std::vector<T> &v)
+    template<class Allocator>
+    OIIO_CONSTEXPR14 span_strided (std::vector<T, Allocator> &v)
         : span_strided(v.size() ? &v[0] : nullptr, v.size(), 1) {}
 
     /// Construct from const std::vector<T>. This turns const std::vector<T>
     /// into an span_strided<const T> (the span_strided isn't
     /// const, but the data it points to will be).
-    constexpr span_strided (const std::vector<value_type> &v)
+    template<class Allocator>
+    constexpr span_strided (const std::vector<value_type, Allocator> &v)
         : span_strided(v.size() ? &v[0] : nullptr, v.size(), 1) {}
 
     /// Construct an span from an initializer_list.

diff --git a/src/include/OpenImageIO/strutil.h b/src/include/OpenImageIO/strutil.h
@@ -613,8 +613,8 @@ template <> inline bool string_is<float> (string_view s) {
 ///
 /// This can work for type T = int, float, or any type for that has
 /// an explicit constructor from a std::string.
-template<class T>
-int extract_from_list_string (std::vector<T> &vals,
+template<class T, class Allocator>
+int extract_from_list_string (std::vector<T, Allocator> &vals,
                               string_view list,
                               string_view sep = ",")
 {