Applied clang-format to the source.

This commit is contained in:
Neil MacIntosh 2016-07-20 13:17:47 -07:00
parent ca4cdd80de
commit b03b04bfcd
8 changed files with 964 additions and 893 deletions

View File

@ -16,6 +16,6 @@ AllowShortLoopsOnASingleLine: true
PointerAlignment: Left PointerAlignment: Left
AlignConsecutiveAssignments: false AlignConsecutiveAssignments: false
AlignTrailingComments: false AlignTrailingComments: true
SpaceAfterCStyleCast: true SpaceAfterCStyleCast: true

View File

@ -21,8 +21,8 @@
#include "gsl_assert.h" // Ensures/Expects #include "gsl_assert.h" // Ensures/Expects
#include "gsl_util.h" // finally()/narrow()/narrow_cast()... #include "gsl_util.h" // finally()/narrow()/narrow_cast()...
#include "span.h" // span
#include "multi_span.h" // multi_span, strided_span... #include "multi_span.h" // multi_span, strided_span...
#include "span.h" // span
#include "string_span.h" // zstring, string_span, zstring_builder... #include "string_span.h" // zstring, string_span, zstring_builder...
#include <memory> #include <memory>
@ -46,7 +46,6 @@
#endif // _MSC_VER #endif // _MSC_VER
namespace gsl namespace gsl
{ {
@ -59,7 +58,6 @@ using std::shared_ptr;
template <class T> template <class T>
using owner = T; using owner = T;
// //
// not_null // not_null
// //
@ -78,9 +76,15 @@ template<class T>
class not_null class not_null
{ {
static_assert(std::is_assignable<T&, std::nullptr_t>::value, "T cannot be assigned nullptr."); static_assert(std::is_assignable<T&, std::nullptr_t>::value, "T cannot be assigned nullptr.");
public: public:
not_null(T t) : ptr_(t) { ensure_invariant(); } not_null(T t) : ptr_(t) { ensure_invariant(); }
not_null& operator=(const T& t) { ptr_ = t; ensure_invariant(); return *this; } not_null& operator=(const T& t)
{
ptr_ = t;
ensure_invariant();
return *this;
}
not_null(const not_null& other) = default; not_null(const not_null& other) = default;
not_null& operator=(const not_null& other) = default; not_null& operator=(const not_null& other) = default;
@ -104,7 +108,8 @@ public:
not_null<T>& operator=(std::nullptr_t) = delete; not_null<T>& operator=(std::nullptr_t) = delete;
not_null<T>& operator=(int) = delete; not_null<T>& operator=(int) = delete;
T get() const { T get() const
{
#ifdef _MSC_VER #ifdef _MSC_VER
__assume(ptr_ != nullptr); __assume(ptr_ != nullptr);
#endif #endif
@ -119,7 +124,8 @@ public:
private: private:
T ptr_; T ptr_;
// we assume that the compiler can hoist/prove away most of the checks inlined from this function // we assume that the compiler can hoist/prove away most of the checks inlined from this
// function
// if not, we could make them optional via conditional compilation // if not, we could make them optional via conditional compilation
void ensure_invariant() const { Expects(ptr_ != nullptr); } void ensure_invariant() const { Expects(ptr_ != nullptr); }
@ -142,10 +148,7 @@ namespace std
template <class T> template <class T>
struct hash<gsl::not_null<T>> struct hash<gsl::not_null<T>>
{ {
size_t operator()(const gsl::not_null<T> & value) const size_t operator()(const gsl::not_null<T>& value) const { return hash<T>{}(value); }
{
return hash<T>{}(value);
}
}; };
} // namespace std } // namespace std

View File

@ -30,15 +30,14 @@
// 2. GSL_THROW_ON_CONTRACT_VIOLATION: a gsl::fail_fast exception will be thrown // 2. GSL_THROW_ON_CONTRACT_VIOLATION: a gsl::fail_fast exception will be thrown
// 3. GSL_UNENFORCED_ON_CONTRACT_VIOLATION: nothing happens // 3. GSL_UNENFORCED_ON_CONTRACT_VIOLATION: nothing happens
// //
#if !(defined(GSL_THROW_ON_CONTRACT_VIOLATION) ^ defined(GSL_TERMINATE_ON_CONTRACT_VIOLATION) ^ defined(GSL_UNENFORCED_ON_CONTRACT_VIOLATION)) #if !(defined(GSL_THROW_ON_CONTRACT_VIOLATION) ^ defined(GSL_TERMINATE_ON_CONTRACT_VIOLATION) ^ \
defined(GSL_UNENFORCED_ON_CONTRACT_VIOLATION))
#define GSL_TERMINATE_ON_CONTRACT_VIOLATION #define GSL_TERMINATE_ON_CONTRACT_VIOLATION
#endif #endif
#define GSL_STRINGIFY_DETAIL(x) #x #define GSL_STRINGIFY_DETAIL(x) #x
#define GSL_STRINGIFY(x) GSL_STRINGIFY_DETAIL(x) #define GSL_STRINGIFY(x) GSL_STRINGIFY_DETAIL(x)
// //
// GSL.assert: assertions // GSL.assert: assertions
// //
@ -53,18 +52,20 @@ struct fail_fast : public std::runtime_error
#if defined(GSL_THROW_ON_CONTRACT_VIOLATION) #if defined(GSL_THROW_ON_CONTRACT_VIOLATION)
#define Expects(cond) if (!(cond)) \ #define Expects(cond) \
if (!(cond)) \
throw gsl::fail_fast("GSL: Precondition failure at " __FILE__ ": " GSL_STRINGIFY(__LINE__)); throw gsl::fail_fast("GSL: Precondition failure at " __FILE__ ": " GSL_STRINGIFY(__LINE__));
#define Ensures(cond) if (!(cond)) \ #define Ensures(cond) \
throw gsl::fail_fast("GSL: Postcondition failure at " __FILE__ ": " GSL_STRINGIFY(__LINE__)); if (!(cond)) \
throw gsl::fail_fast("GSL: Postcondition failure at " __FILE__ \
": " GSL_STRINGIFY(__LINE__));
#elif defined(GSL_TERMINATE_ON_CONTRACT_VIOLATION) #elif defined(GSL_TERMINATE_ON_CONTRACT_VIOLATION)
#define Expects(cond) \
#define Expects(cond) if (!(cond)) std::terminate(); if (!(cond)) std::terminate();
#define Ensures(cond) if (!(cond)) std::terminate(); #define Ensures(cond) \
if (!(cond)) std::terminate();
#elif defined(GSL_UNENFORCED_ON_CONTRACT_VIOLATION) #elif defined(GSL_UNENFORCED_ON_CONTRACT_VIOLATION)
@ -73,5 +74,4 @@ struct fail_fast : public std::runtime_error
#endif #endif
#endif // GSL_CONTRACTS_H #endif // GSL_CONTRACTS_H

View File

@ -40,52 +40,74 @@ namespace gsl
{ {
// This is a simple definition for now that allows // This is a simple definition for now that allows
// use of byte within span<> to be standards-compliant // use of byte within span<> to be standards-compliant
enum class byte : unsigned char {}; enum class byte : unsigned char
{
};
template <class IntegerType, class = std::enable_if_t<std::is_integral<IntegerType>::value>> template <class IntegerType, class = std::enable_if_t<std::is_integral<IntegerType>::value>>
constexpr byte& operator<<=(byte& b, IntegerType shift) noexcept constexpr byte& operator<<=(byte& b, IntegerType shift) noexcept
{ return b = byte(static_cast<unsigned char>(b) << shift); } {
return b = byte(static_cast<unsigned char>(b) << shift);
}
template <class IntegerType, class = std::enable_if_t<std::is_integral<IntegerType>::value>> template <class IntegerType, class = std::enable_if_t<std::is_integral<IntegerType>::value>>
constexpr byte operator<<(byte b, IntegerType shift) noexcept constexpr byte operator<<(byte b, IntegerType shift) noexcept
{ return byte(static_cast<unsigned char>(b) << shift); } {
return byte(static_cast<unsigned char>(b) << shift);
}
template <class IntegerType, class = std::enable_if_t<std::is_integral<IntegerType>::value>> template <class IntegerType, class = std::enable_if_t<std::is_integral<IntegerType>::value>>
constexpr byte& operator>>=(byte& b, IntegerType shift) noexcept constexpr byte& operator>>=(byte& b, IntegerType shift) noexcept
{ return b = byte(static_cast<unsigned char>(b) >> shift); } {
return b = byte(static_cast<unsigned char>(b) >> shift);
}
template <class IntegerType, class = std::enable_if_t<std::is_integral<IntegerType>::value>> template <class IntegerType, class = std::enable_if_t<std::is_integral<IntegerType>::value>>
constexpr byte operator>>(byte b, IntegerType shift) noexcept constexpr byte operator>>(byte b, IntegerType shift) noexcept
{ return byte(static_cast<unsigned char>(b) >> shift); } {
return byte(static_cast<unsigned char>(b) >> shift);
}
constexpr byte& operator|=(byte& l, byte r) noexcept constexpr byte& operator|=(byte& l, byte r) noexcept
{ return l = byte(static_cast<unsigned char>(l) | static_cast<unsigned char>(r)); } {
return l = byte(static_cast<unsigned char>(l) | static_cast<unsigned char>(r));
}
constexpr byte operator|(byte l, byte r) noexcept constexpr byte operator|(byte l, byte r) noexcept
{ return byte(static_cast<unsigned char>(l) + static_cast<unsigned char>(r)); } {
return byte(static_cast<unsigned char>(l) + static_cast<unsigned char>(r));
}
constexpr byte& operator&=(byte& l, byte r) noexcept constexpr byte& operator&=(byte& l, byte r) noexcept
{ return l = byte(static_cast<unsigned char>(l) & static_cast<unsigned char>(r)); } {
return l = byte(static_cast<unsigned char>(l) & static_cast<unsigned char>(r));
}
constexpr byte operator&(byte l, byte r) noexcept constexpr byte operator&(byte l, byte r) noexcept
{ return byte(static_cast<unsigned char>(l) & static_cast<unsigned char>(r)); } {
return byte(static_cast<unsigned char>(l) & static_cast<unsigned char>(r));
}
constexpr byte& operator^=(byte& l, byte r) noexcept constexpr byte& operator^=(byte& l, byte r) noexcept
{ return l = byte(static_cast<unsigned char>(l) ^ static_cast<unsigned char>(r)); } {
return l = byte(static_cast<unsigned char>(l) ^ static_cast<unsigned char>(r));
}
constexpr byte operator^(byte l, byte r) noexcept constexpr byte operator^(byte l, byte r) noexcept
{ return byte(static_cast<unsigned char>(l) ^ static_cast<unsigned char>(r)); } {
return byte(static_cast<unsigned char>(l) ^ static_cast<unsigned char>(r));
}
constexpr byte operator~(byte b) noexcept constexpr byte operator~(byte b) noexcept { return byte(~static_cast<unsigned char>(b)); }
{ return byte(~static_cast<unsigned char>(b)); }
template <class IntegerType, class = std::enable_if_t<std::is_integral<IntegerType>::value>> template <class IntegerType, class = std::enable_if_t<std::is_integral<IntegerType>::value>>
constexpr IntegerType to_integer(byte b) noexcept { return {b}; } constexpr IntegerType to_integer(byte b) noexcept
{
return {b};
}
} // namespace gsl } // namespace gsl
#ifdef _MSC_VER #ifdef _MSC_VER
#if _MSC_VER <= 1800 #if _MSC_VER <= 1800

View File

@ -21,9 +21,9 @@
#include "gsl_assert.h" // Ensures/Expects #include "gsl_assert.h" // Ensures/Expects
#include <array> #include <array>
#include <utility>
#include <type_traits>
#include <exception> #include <exception>
#include <type_traits>
#include <utility>
#ifdef _MSC_VER #ifdef _MSC_VER
@ -48,7 +48,6 @@
#endif // _MSC_VER #endif // _MSC_VER
namespace gsl namespace gsl
{ {
// //
@ -60,18 +59,20 @@ template <class F>
class final_act class final_act
{ {
public: public:
explicit final_act(F f) noexcept explicit final_act(F f) noexcept : f_(std::move(f)), invoke_(true) {}
: f_(std::move(f)), invoke_(true)
{}
final_act(final_act&& other) noexcept final_act(final_act&& other) noexcept : f_(std::move(other.f_)), invoke_(other.invoke_)
: f_(std::move(other.f_)), invoke_(other.invoke_) {
{ other.invoke_ = false; } other.invoke_ = false;
}
final_act(const final_act&) = delete; final_act(const final_act&) = delete;
final_act& operator=(const final_act&) = delete; final_act& operator=(const final_act&) = delete;
~final_act() noexcept { if (invoke_) f_(); } ~final_act() noexcept
{
if (invoke_) f_();
}
private: private:
F f_; F f_;
@ -80,25 +81,35 @@ private:
// finally() - convenience function to generate a final_act // finally() - convenience function to generate a final_act
template <class F> template <class F>
inline final_act<F> finally(const F &f) inline final_act<F> finally(const F& f) noexcept
noexcept { return final_act<F>(f); } {
return final_act<F>(f);
}
template <class F> template <class F>
inline final_act<F> finally(F&& f) noexcept inline final_act<F> finally(F&& f) noexcept
{ return final_act<F>(std::forward<F>(f)); } {
return final_act<F>(std::forward<F>(f));
}
// narrow_cast(): a searchable way to do narrowing casts of values // narrow_cast(): a searchable way to do narrowing casts of values
template <class T, class U> template <class T, class U>
inline constexpr T narrow_cast(U u) noexcept inline constexpr T narrow_cast(U u) noexcept
{ return static_cast<T>(u); } {
return static_cast<T>(u);
}
struct narrowing_error : public std::exception {}; struct narrowing_error : public std::exception
{
};
namespace details namespace details
{ {
template <class T, class U> template <class T, class U>
struct is_same_signedness : public std::integral_constant<bool, std::is_signed<T>::value == std::is_signed<U>::value> struct is_same_signedness
{}; : public std::integral_constant<bool, std::is_signed<T>::value == std::is_signed<U>::value>
{
};
} }
// narrow() : a checked version of narrow_cast() that throws if the cast changed the value // narrow() : a checked version of narrow_cast() that throws if the cast changed the value
@ -106,8 +117,7 @@ template<class T, class U>
inline T narrow(U u) inline T narrow(U u)
{ {
T t = narrow_cast<T>(u); T t = narrow_cast<T>(u);
if (static_cast<U>(t) != u) if (static_cast<U>(t) != u) throw narrowing_error();
throw narrowing_error();
#pragma warning(suppress : 4127) // suppress warning from MSVC compiler about constant in if-test #pragma warning(suppress : 4127) // suppress warning from MSVC compiler about constant in if-test
if (!details::is_same_signedness<T, U>::value && ((t < T{}) != (u < U{}))) if (!details::is_same_signedness<T, U>::value && ((t < T{}) != (u < U{})))
throw narrowing_error(); throw narrowing_error();
@ -119,23 +129,34 @@ inline T narrow(U u)
// //
template <class T, size_t N> template <class T, size_t N>
constexpr T& at(T (&arr)[N], size_t index) constexpr T& at(T (&arr)[N], size_t index)
{ Expects(index < N); return arr[index]; } {
Expects(index < N);
return arr[index];
}
template <class T, size_t N> template <class T, size_t N>
constexpr T& at(std::array<T, N>& arr, size_t index) constexpr T& at(std::array<T, N>& arr, size_t index)
{ Expects(index < N); return arr[index]; } {
Expects(index < N);
return arr[index];
}
template <class Cont> template <class Cont>
constexpr typename Cont::value_type& at(Cont& cont, size_t index) constexpr typename Cont::value_type& at(Cont& cont, size_t index)
{ Expects(index < cont.size()); return cont[index]; } {
Expects(index < cont.size());
return cont[index];
}
template <class T> template <class T>
constexpr const T& at(std::initializer_list<T> cont, size_t index) constexpr const T& at(std::initializer_list<T> cont, size_t index)
{ Expects(index < cont.size()); return *(cont.begin() + index); } {
Expects(index < cont.size());
return *(cont.begin() + index);
}
} // namespace gsl } // namespace gsl
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)

View File

@ -20,8 +20,8 @@
#define GSL_MULTI_SPAN_H #define GSL_MULTI_SPAN_H
#include "gsl_assert.h" #include "gsl_assert.h"
#include "gsl_util.h"
#include "gsl_byte.h" #include "gsl_byte.h"
#include "gsl_util.h"
#include <algorithm> #include <algorithm>
#include <array> #include <array>
#include <cassert> #include <cassert>
@ -217,10 +217,7 @@ public:
return ret; return ret;
} }
friend constexpr index operator*(value_type v, const index& rhs) noexcept friend constexpr index operator*(value_type v, const index& rhs) noexcept { return rhs * v; }
{
return rhs * v;
}
constexpr index& operator*=(value_type v) noexcept constexpr index& operator*=(value_type v) noexcept
{ {
@ -743,8 +740,7 @@ public:
} }
constexpr strided_bounds(const index_type& extents, const index_type& strides) noexcept constexpr strided_bounds(const index_type& extents, const index_type& strides) noexcept
: m_extents(extents), : m_extents(extents), m_strides(strides)
m_strides(strides)
{ {
} }
@ -841,8 +837,7 @@ public:
using index_size_type = typename IndexType::value_type; using index_size_type = typename IndexType::value_type;
template <typename Bounds> template <typename Bounds>
explicit bounds_iterator(const Bounds& bnd, value_type curr) noexcept explicit bounds_iterator(const Bounds& bnd, value_type curr) noexcept
: boundary_(bnd.index_bounds()), : boundary_(bnd.index_bounds()), curr_(std::move(curr))
curr_(std::move(curr))
{ {
static_assert(is_bounds<Bounds>::value, "Bounds type must be provided"); static_assert(is_bounds<Bounds>::value, "Bounds type must be provided");
} }
@ -1159,7 +1154,8 @@ namespace details
}; };
template <typename ValueType, std::ptrdiff_t FirstDimension, std::ptrdiff_t... RestDimensions> template <typename ValueType, std::ptrdiff_t FirstDimension, std::ptrdiff_t... RestDimensions>
struct is_multi_span_oracle<multi_span<ValueType, FirstDimension, RestDimensions...>> : std::true_type struct is_multi_span_oracle<multi_span<ValueType, FirstDimension, RestDimensions...>>
: std::true_type
{ {
}; };
@ -1249,11 +1245,13 @@ public:
constexpr multi_span(value_type&&) = delete; constexpr multi_span(value_type&&) = delete;
// construct from pointer + length // construct from pointer + length
constexpr multi_span(pointer ptr, size_type size) noexcept : multi_span(ptr, bounds_type{size}) {} constexpr multi_span(pointer ptr, size_type size) noexcept : multi_span(ptr, bounds_type{size})
{
}
// construct from pointer + length - multidimensional // construct from pointer + length - multidimensional
constexpr multi_span(pointer data, bounds_type bounds) noexcept : data_(data), constexpr multi_span(pointer data, bounds_type bounds) noexcept
bounds_(std::move(bounds)) : data_(data), bounds_(std::move(bounds))
{ {
Expects((bounds_.size() > 0 && data != nullptr) || bounds_.size() == 0); Expects((bounds_.size() > 0 && data != nullptr) || bounds_.size() == 0);
} }
@ -1263,7 +1261,8 @@ public:
typename = std::enable_if_t<std::is_convertible<Ptr, pointer>::value && typename = std::enable_if_t<std::is_convertible<Ptr, pointer>::value &&
details::LessThan<bounds_type::dynamic_rank, 2>::value>> details::LessThan<bounds_type::dynamic_rank, 2>::value>>
constexpr multi_span(pointer begin, Ptr end) constexpr multi_span(pointer begin, Ptr end)
: multi_span(begin, details::newBoundsHelper<bounds_type>(static_cast<pointer>(end) - begin)) : multi_span(begin,
details::newBoundsHelper<bounds_type>(static_cast<pointer>(end) - begin))
{ {
Expects(begin != nullptr && end != nullptr && begin <= static_cast<pointer>(end)); Expects(begin != nullptr && end != nullptr && begin <= static_cast<pointer>(end));
} }
@ -1273,8 +1272,7 @@ public:
constexpr multi_span(T (&arr)[N]) constexpr multi_span(T (&arr)[N])
: multi_span(reinterpret_cast<pointer>(arr), bounds_type{typename Helper::bounds_type{}}) : multi_span(reinterpret_cast<pointer>(arr), bounds_type{typename Helper::bounds_type{}})
{ {
static_assert( static_assert(std::is_convertible<typename Helper::value_type(*)[], value_type(*)[]>::value,
std::is_convertible<typename Helper::value_type(*) [], value_type(*) []>::value,
"Cannot convert from source type to target multi_span type."); "Cannot convert from source type to target multi_span type.");
static_assert(std::is_convertible<typename Helper::bounds_type, bounds_type>::value, static_assert(std::is_convertible<typename Helper::bounds_type, bounds_type>::value,
"Cannot construct a multi_span from an array with fewer elements."); "Cannot construct a multi_span from an array with fewer elements.");
@ -1286,14 +1284,14 @@ public:
constexpr multi_span(T* const& data, size_type size) constexpr multi_span(T* const& data, size_type size)
: multi_span(reinterpret_cast<pointer>(data), typename Helper::bounds_type{size}) : multi_span(reinterpret_cast<pointer>(data), typename Helper::bounds_type{size})
{ {
static_assert( static_assert(std::is_convertible<typename Helper::value_type(*)[], value_type(*)[]>::value,
std::is_convertible<typename Helper::value_type(*) [], value_type(*) []>::value,
"Cannot convert from source type to target multi_span type."); "Cannot convert from source type to target multi_span type.");
} }
// construct from std::array // construct from std::array
template <typename T, size_t N> template <typename T, size_t N>
constexpr multi_span(std::array<T, N>& arr) : multi_span(arr.data(), bounds_type{static_bounds<N>{}}) constexpr multi_span(std::array<T, N>& arr)
: multi_span(arr.data(), bounds_type{static_bounds<N>{}})
{ {
static_assert( static_assert(
std::is_convertible<T(*)[], typename std::remove_const_t<value_type>(*)[]>::value, std::is_convertible<T(*)[], typename std::remove_const_t<value_type>(*)[]>::value,
@ -1348,8 +1346,8 @@ public:
typename OtherBounds = static_bounds<OtherDimensions...>, typename OtherBounds = static_bounds<OtherDimensions...>,
typename = std::enable_if_t<std::is_convertible<OtherValueType, ValueType>::value && typename = std::enable_if_t<std::is_convertible<OtherValueType, ValueType>::value &&
std::is_convertible<OtherBounds, bounds_type>::value>> std::is_convertible<OtherBounds, bounds_type>::value>>
constexpr multi_span(multi_span<OtherValueType, OtherDimensions...> other) noexcept : data_(other.data_), constexpr multi_span(multi_span<OtherValueType, OtherDimensions...> other) noexcept
bounds_(other.bounds_) : data_(other.data_), bounds_(other.bounds_)
{ {
} }
@ -1424,7 +1422,8 @@ public:
// subspan() - create a subview of count elements starting at offset // subspan() - create a subview of count elements starting at offset
// supplying dynamic_range for count will consume all available elements from offset // supplying dynamic_range for count will consume all available elements from offset
constexpr multi_span<ValueType, dynamic_range> subspan(size_type offset, constexpr multi_span<ValueType, dynamic_range> subspan(size_type offset,
size_type count = dynamic_range) const noexcept size_type count = dynamic_range) const
noexcept
{ {
Expects((offset >= 0 && offset <= this->size()) && Expects((offset >= 0 && offset <= this->size()) &&
(count == dynamic_range || (count <= this->size() - offset))); (count == dynamic_range || (count <= this->size() - offset)));
@ -1535,7 +1534,8 @@ public:
template <typename OtherValueType, std::ptrdiff_t... OtherDimensions, template <typename OtherValueType, std::ptrdiff_t... OtherDimensions,
typename Dummy = std::enable_if_t<std::is_same< typename Dummy = std::enable_if_t<std::is_same<
std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>> std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>>
constexpr bool operator==(const multi_span<OtherValueType, OtherDimensions...>& other) const noexcept constexpr bool operator==(const multi_span<OtherValueType, OtherDimensions...>& other) const
noexcept
{ {
return bounds_.size() == other.bounds_.size() && return bounds_.size() == other.bounds_.size() &&
(data_ == other.data_ || std::equal(this->begin(), this->end(), other.begin())); (data_ == other.data_ || std::equal(this->begin(), this->end(), other.begin()));
@ -1544,7 +1544,8 @@ public:
template <typename OtherValueType, std::ptrdiff_t... OtherDimensions, template <typename OtherValueType, std::ptrdiff_t... OtherDimensions,
typename Dummy = std::enable_if_t<std::is_same< typename Dummy = std::enable_if_t<std::is_same<
std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>> std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>>
constexpr bool operator!=(const multi_span<OtherValueType, OtherDimensions...>& other) const noexcept constexpr bool operator!=(const multi_span<OtherValueType, OtherDimensions...>& other) const
noexcept
{ {
return !(*this == other); return !(*this == other);
} }
@ -1552,7 +1553,8 @@ public:
template <typename OtherValueType, std::ptrdiff_t... OtherDimensions, template <typename OtherValueType, std::ptrdiff_t... OtherDimensions,
typename Dummy = std::enable_if_t<std::is_same< typename Dummy = std::enable_if_t<std::is_same<
std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>> std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>>
constexpr bool operator<(const multi_span<OtherValueType, OtherDimensions...>& other) const noexcept constexpr bool operator<(const multi_span<OtherValueType, OtherDimensions...>& other) const
noexcept
{ {
return std::lexicographical_compare(this->begin(), this->end(), other.begin(), other.end()); return std::lexicographical_compare(this->begin(), this->end(), other.begin(), other.end());
} }
@ -1560,7 +1562,8 @@ public:
template <typename OtherValueType, std::ptrdiff_t... OtherDimensions, template <typename OtherValueType, std::ptrdiff_t... OtherDimensions,
typename Dummy = std::enable_if_t<std::is_same< typename Dummy = std::enable_if_t<std::is_same<
std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>> std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>>
constexpr bool operator<=(const multi_span<OtherValueType, OtherDimensions...>& other) const noexcept constexpr bool operator<=(const multi_span<OtherValueType, OtherDimensions...>& other) const
noexcept
{ {
return !(other < *this); return !(other < *this);
} }
@ -1568,7 +1571,8 @@ public:
template <typename OtherValueType, std::ptrdiff_t... OtherDimensions, template <typename OtherValueType, std::ptrdiff_t... OtherDimensions,
typename Dummy = std::enable_if_t<std::is_same< typename Dummy = std::enable_if_t<std::is_same<
std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>> std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>>
constexpr bool operator>(const multi_span<OtherValueType, OtherDimensions...>& other) const noexcept constexpr bool operator>(const multi_span<OtherValueType, OtherDimensions...>& other) const
noexcept
{ {
return (other < *this); return (other < *this);
} }
@ -1576,7 +1580,8 @@ public:
template <typename OtherValueType, std::ptrdiff_t... OtherDimensions, template <typename OtherValueType, std::ptrdiff_t... OtherDimensions,
typename Dummy = std::enable_if_t<std::is_same< typename Dummy = std::enable_if_t<std::is_same<
std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>> std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>>
constexpr bool operator>=(const multi_span<OtherValueType, OtherDimensions...>& other) const noexcept constexpr bool operator>=(const multi_span<OtherValueType, OtherDimensions...>& other) const
noexcept
{ {
return !(*this < other); return !(*this < other);
} }
@ -1590,8 +1595,8 @@ public:
// DimCount and Enabled here are workarounds for a bug in MSVC 2015 // DimCount and Enabled here are workarounds for a bug in MSVC 2015
template <typename SpanType, typename... Dimensions2, size_t DimCount = sizeof...(Dimensions2), template <typename SpanType, typename... Dimensions2, size_t DimCount = sizeof...(Dimensions2),
bool Enabled = (DimCount > 0), typename = std::enable_if_t<Enabled>> bool Enabled = (DimCount > 0), typename = std::enable_if_t<Enabled>>
constexpr multi_span<typename SpanType::value_type, Dimensions2::value...> as_span(SpanType s, constexpr multi_span<typename SpanType::value_type, Dimensions2::value...>
Dimensions2... dims) as_span(SpanType s, Dimensions2... dims)
{ {
static_assert(details::is_multi_span<SpanType>::value, static_assert(details::is_multi_span<SpanType>::value,
"Variadic as_span() is for reshaping existing spans."); "Variadic as_span() is for reshaping existing spans.");
@ -1628,8 +1633,8 @@ multi_span<byte> as_writeable_bytes(multi_span<U, Dimensions...> s) noexcept
// on all implementations. It should be considered an experimental extension // on all implementations. It should be considered an experimental extension
// to the standard GSL interface. // to the standard GSL interface.
template <typename U, std::ptrdiff_t... Dimensions> template <typename U, std::ptrdiff_t... Dimensions>
constexpr auto as_span(multi_span<const byte, Dimensions...> s) noexcept constexpr auto as_span(multi_span<const byte, Dimensions...> s) noexcept -> multi_span<
-> multi_span<const U, static_cast<std::ptrdiff_t>( const U, static_cast<std::ptrdiff_t>(
multi_span<const byte, Dimensions...>::bounds_type::static_size != dynamic_range multi_span<const byte, Dimensions...>::bounds_type::static_size != dynamic_range
? (static_cast<size_t>( ? (static_cast<size_t>(
multi_span<const byte, Dimensions...>::bounds_type::static_size) / multi_span<const byte, Dimensions...>::bounds_type::static_size) /
@ -1653,10 +1658,11 @@ constexpr auto as_span(multi_span<const byte, Dimensions...> s) noexcept
// on all implementations. It should be considered an experimental extension // on all implementations. It should be considered an experimental extension
// to the standard GSL interface. // to the standard GSL interface.
template <typename U, std::ptrdiff_t... Dimensions> template <typename U, std::ptrdiff_t... Dimensions>
constexpr auto as_span(multi_span<byte, Dimensions...> s) noexcept -> multi_span< constexpr auto as_span(multi_span<byte, Dimensions...> s) noexcept
U, narrow_cast<std::ptrdiff_t>( -> multi_span<U, narrow_cast<std::ptrdiff_t>(
multi_span<byte, Dimensions...>::bounds_type::static_size != dynamic_range multi_span<byte, Dimensions...>::bounds_type::static_size != dynamic_range
? static_cast<std::size_t>(multi_span<byte, Dimensions...>::bounds_type::static_size) / ? static_cast<std::size_t>(
multi_span<byte, Dimensions...>::bounds_type::static_size) /
sizeof(U) sizeof(U)
: dynamic_range)> : dynamic_range)>
{ {
@ -1816,8 +1822,8 @@ public:
auto d = narrow_cast<size_type>(sizeof(OtherValueType) / sizeof(value_type)); auto d = narrow_cast<size_type>(sizeof(OtherValueType) / sizeof(value_type));
size_type size = this->bounds().total_size() / d; size_type size = this->bounds().total_size() / d;
return {const_cast<OtherValueType*>(reinterpret_cast<const OtherValueType*>(this->data())), size, return {const_cast<OtherValueType*>(reinterpret_cast<const OtherValueType*>(this->data())),
bounds_type{resize_extent(this->bounds().index_bounds(), d), size, bounds_type{resize_extent(this->bounds().index_bounds(), d),
resize_stride(this->bounds().strides(), d)}}; resize_stride(this->bounds().strides(), d)}};
} }
@ -2154,10 +2160,7 @@ public:
Expects(m_container == rhs.m_container); Expects(m_container == rhs.m_container);
return m_itr - rhs.m_itr; return m_itr - rhs.m_itr;
} }
value_type operator[](difference_type n) const noexcept value_type operator[](difference_type n) const noexcept { return (*m_container)[m_itr[n]]; }
{
return (*m_container)[m_itr[n]];
}
bool operator==(const general_span_iterator& rhs) const noexcept bool operator==(const general_span_iterator& rhs) const noexcept
{ {

View File

@ -20,11 +20,11 @@
#define GSL_SPAN_H #define GSL_SPAN_H
#include "gsl_assert.h" #include "gsl_assert.h"
#include "gsl_util.h"
#include "gsl_byte.h" #include "gsl_byte.h"
#include "gsl_util.h"
#include <array> #include <array>
#include <limits>
#include <iterator> #include <iterator>
#include <limits>
#include <stdexcept> #include <stdexcept>
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
@ -82,11 +82,9 @@ namespace gsl
template <class ElementType, std::ptrdiff_t Extent = dynamic_extent> template <class ElementType, std::ptrdiff_t Extent = dynamic_extent>
class span; class span;
// [views.constants], constants // [views.constants], constants
constexpr const std::ptrdiff_t dynamic_extent = -1; constexpr const std::ptrdiff_t dynamic_extent = -1;
// implementation details // implementation details
namespace details namespace details
{ {
@ -107,43 +105,30 @@ struct is_span : is_span_oracle<std::remove_cv_t<T>>
template <class From, class To> template <class From, class To>
struct is_allowed_pointer_conversion struct is_allowed_pointer_conversion
: std::bool_constant< : std::bool_constant<std::is_pointer<From>::value && std::is_pointer<To>::value &&
std::is_pointer<From>::value && std::is_convertible<From, To>::value>
std::is_pointer<To>::value &&
std::is_convertible<From, To>::value
>
{ {
}; };
template <class From, class To> template <class From, class To>
struct is_allowed_integral_conversion struct is_allowed_integral_conversion
: std::bool_constant< : std::bool_constant<std::is_integral<From>::value && std::is_integral<To>::value &&
std::is_integral<From>::value && sizeof(From) == sizeof(To) && alignof(From) == alignof(To) &&
std::is_integral<To>::value && std::is_convertible<From, To>::value>
sizeof(From) == sizeof(To) &&
alignof(From) == alignof(To) &&
std::is_convertible<From, To>::value
>
{ {
}; };
template <std::ptrdiff_t From, std::ptrdiff_t To> template <std::ptrdiff_t From, std::ptrdiff_t To>
struct is_allowed_extent_conversion struct is_allowed_extent_conversion
: std::bool_constant< : std::bool_constant<From == To || From == gsl::dynamic_extent || To == gsl::dynamic_extent>
From == To ||
From == gsl::dynamic_extent ||
To == gsl::dynamic_extent
>
{ {
}; };
template <class From, class To> template <class From, class To>
struct is_allowed_element_type_conversion struct is_allowed_element_type_conversion
: std::bool_constant< : std::bool_constant<std::is_same<From, std::remove_cv_t<To>>::value ||
std::is_same<From, std::remove_cv_t<To>>::value ||
is_allowed_pointer_conversion<From, To>::value || is_allowed_pointer_conversion<From, To>::value ||
is_allowed_integral_conversion<From, To>::value is_allowed_integral_conversion<From, To>::value>
>
{ {
}; };
@ -154,8 +139,7 @@ struct is_allowed_element_type_conversion<From, byte>
}; };
template <class From> template <class From>
struct is_allowed_element_type_conversion<From, const byte> struct is_allowed_element_type_conversion<From, const byte> : std::true_type
: std::true_type
{ {
}; };
@ -174,13 +158,22 @@ public:
using reference = const_reference; using reference = const_reference;
constexpr const_span_iterator() : const_span_iterator(nullptr, 0) {} constexpr const_span_iterator() : const_span_iterator(nullptr, 0) {}
constexpr const_span_iterator(const Span* span, typename Span::index_type index) : span_(span), index_(index) constexpr const_span_iterator(const Span* span, typename Span::index_type index)
: span_(span), index_(index)
{ {
Expects(span == nullptr || (index_ >= 0 && index <= span_->length())); Expects(span == nullptr || (index_ >= 0 && index <= span_->length()));
} }
constexpr reference operator*() const { Expects(span_); return (*span_)[index_]; } constexpr reference operator*() const
constexpr pointer operator->() const { Expects(span_); return &((*span_)[index_]); } {
Expects(span_);
return (*span_)[index_];
}
constexpr pointer operator->() const
{
Expects(span_);
return &((*span_)[index_]);
}
constexpr const_span_iterator& operator++() noexcept constexpr const_span_iterator& operator++() noexcept
{ {
@ -240,17 +233,17 @@ public:
return index_ - rhs.index_; return index_ - rhs.index_;
} }
constexpr reference operator[](difference_type n) const noexcept constexpr reference operator[](difference_type n) const noexcept { return *(*this + n); }
{
return *(*this + n);
}
constexpr bool operator==(const const_span_iterator& rhs) const noexcept constexpr bool operator==(const const_span_iterator& rhs) const noexcept
{ {
return span_ == rhs.span_ && index_ == rhs.index_; return span_ == rhs.span_ && index_ == rhs.index_;
} }
constexpr bool operator!=(const const_span_iterator& rhs) const noexcept { return !(*this == rhs); } constexpr bool operator!=(const const_span_iterator& rhs) const noexcept
{
return !(*this == rhs);
}
constexpr bool operator<(const const_span_iterator& rhs) const noexcept constexpr bool operator<(const const_span_iterator& rhs) const noexcept
{ {
@ -258,11 +251,20 @@ public:
return index_ < rhs.index_; return index_ < rhs.index_;
} }
constexpr bool operator<=(const const_span_iterator& rhs) const noexcept { return !(rhs < *this); } constexpr bool operator<=(const const_span_iterator& rhs) const noexcept
{
return !(rhs < *this);
}
constexpr bool operator>(const const_span_iterator& rhs) const noexcept { return rhs < *this; } constexpr bool operator>(const const_span_iterator& rhs) const noexcept
{
return rhs < *this;
}
constexpr bool operator>=(const const_span_iterator& rhs) const noexcept { return !(rhs > *this); } constexpr bool operator>=(const const_span_iterator& rhs) const noexcept
{
return !(rhs > *this);
}
void swap(const_span_iterator& rhs) noexcept void swap(const_span_iterator& rhs) noexcept
{ {
@ -275,7 +277,6 @@ private:
ptrdiff_t index_; ptrdiff_t index_;
}; };
template <class Span> template <class Span>
class span_iterator : public const_span_iterator<Span> class span_iterator : public const_span_iterator<Span>
{ {
@ -290,55 +291,104 @@ public:
using reference = value_type&; using reference = value_type&;
constexpr span_iterator() : base_type() {} constexpr span_iterator() : base_type() {}
constexpr span_iterator(const Span* span, typename Span::index_type index) : base_type(span, index) {} constexpr span_iterator(const Span* span, typename Span::index_type index)
: base_type(span, index)
{
}
constexpr reference operator*() const { return const_cast<reference>(base_type::operator*()); } constexpr reference operator*() const
constexpr pointer operator->() const { return const_cast<pointer>(base_type::operator->()); } {
return const_cast<reference>(base_type::operator*());
}
constexpr pointer operator->() const
{
return const_cast<pointer>(base_type::operator->());
}
constexpr span_iterator& operator++() noexcept { base_type::operator++(); return *this; } constexpr span_iterator& operator++() noexcept
{
base_type::operator++();
return *this;
}
constexpr span_iterator operator++(int) noexcept { return base_type::operator++(1); } constexpr span_iterator operator++(int) noexcept { return base_type::operator++(1); }
constexpr span_iterator& operator--() noexcept { base_type::operator--(); return *this; } constexpr span_iterator& operator--() noexcept
{
base_type::operator--();
return *this;
}
constexpr span_iterator operator--(int) noexcept { return base_type::operator--(1); } constexpr span_iterator operator--(int) noexcept { return base_type::operator--(1); }
constexpr span_iterator operator+(difference_type n) const noexcept { return base_type::operator+(n); } constexpr span_iterator operator+(difference_type n) const noexcept
{
return base_type::operator+(n);
}
constexpr span_iterator& operator+=(difference_type n) noexcept { return base_type::operator+=(n); } constexpr span_iterator& operator+=(difference_type n) noexcept
{
return base_type::operator+=(n);
}
constexpr span_iterator operator-(difference_type n) const noexcept { return base_type::operator-(n); } constexpr span_iterator operator-(difference_type n) const noexcept
{
return base_type::operator-(n);
}
constexpr span_iterator& operator-=(difference_type n) noexcept { return base_type::operator-=(n); } constexpr span_iterator& operator-=(difference_type n) noexcept
{
return base_type::operator-=(n);
}
constexpr difference_type operator-(const span_iterator& rhs) const noexcept { return base_type::operator-(rhs); } constexpr difference_type operator-(const span_iterator& rhs) const noexcept
{
return base_type::operator-(rhs);
}
constexpr reference operator[](difference_type n) const noexcept { return *(*this + n); } constexpr reference operator[](difference_type n) const noexcept { return *(*this + n); }
constexpr bool operator==(const span_iterator& rhs) const noexcept { return base_type::operator==(rhs); } constexpr bool operator==(const span_iterator& rhs) const noexcept
{
return base_type::operator==(rhs);
}
constexpr bool operator!=(const span_iterator& rhs) const noexcept { return !(*this == rhs); } constexpr bool operator!=(const span_iterator& rhs) const noexcept
{
return !(*this == rhs);
}
constexpr bool operator<(const span_iterator& rhs) const noexcept { return base_type::operator<(rhs); } constexpr bool operator<(const span_iterator& rhs) const noexcept
{
return base_type::operator<(rhs);
}
constexpr bool operator<=(const span_iterator& rhs) const noexcept { return !(rhs < *this); } constexpr bool operator<=(const span_iterator& rhs) const noexcept
{
return !(rhs < *this);
}
constexpr bool operator>(const span_iterator& rhs) const noexcept { return rhs < *this; } constexpr bool operator>(const span_iterator& rhs) const noexcept { return rhs < *this; }
constexpr bool operator>=(const span_iterator& rhs) const noexcept { return !(rhs > *this); } constexpr bool operator>=(const span_iterator& rhs) const noexcept
{
return !(rhs > *this);
}
void swap(span_iterator& rhs) noexcept { base_type::swap(rhs); } void swap(span_iterator& rhs) noexcept { base_type::swap(rhs); }
}; };
template <typename Span> template <typename Span>
constexpr const_span_iterator<Span> operator+(typename const_span_iterator<Span>::difference_type n, constexpr const_span_iterator<Span>
operator+(typename const_span_iterator<Span>::difference_type n,
const const_span_iterator<Span>& rhs) noexcept const const_span_iterator<Span>& rhs) noexcept
{ {
return rhs + n; return rhs + n;
} }
template <typename Span> template <typename Span>
constexpr const_span_iterator<Span> operator-(typename const_span_iterator<Span>::difference_type n, constexpr const_span_iterator<Span>
operator-(typename const_span_iterator<Span>::difference_type n,
const const_span_iterator<Span>& rhs) noexcept const const_span_iterator<Span>& rhs) noexcept
{ {
return rhs - n; return rhs - n;
@ -360,10 +410,10 @@ constexpr span_iterator<Span> operator-(typename span_iterator<Span>::difference
} // namespace details } // namespace details
// [span], class template span // [span], class template span
template <class ElementType, std::ptrdiff_t Extent> template <class ElementType, std::ptrdiff_t Extent>
class span { class span
{
public: public:
// constants and types // constants and types
using element_type = ElementType; using element_type = ElementType;
@ -379,78 +429,83 @@ public:
constexpr static const index_type extent = Extent; constexpr static const index_type extent = Extent;
// [span.cons], span constructors, copy, assignment, and destructor // [span.cons], span constructors, copy, assignment, and destructor
constexpr span() noexcept : storage_(nullptr, extent_type<0>()) constexpr span() noexcept : storage_(nullptr, extent_type<0>()) {}
{}
constexpr span(nullptr_t) noexcept : span() constexpr span(nullptr_t) noexcept : span() {}
{}
constexpr span(pointer ptr, index_type count) : storage_(ptr, count) constexpr span(pointer ptr, index_type count) : storage_(ptr, count) {}
{}
constexpr span(pointer firstElem, pointer lastElem) constexpr span(pointer firstElem, pointer lastElem)
: storage_(firstElem, std::distance(firstElem, lastElem)) : storage_(firstElem, std::distance(firstElem, lastElem))
{} {
}
template <size_t N> template <size_t N>
constexpr span(element_type(&arr)[N]) noexcept constexpr span(element_type (&arr)[N]) noexcept : storage_(&arr[0], extent_type<N>())
: storage_(&arr[0], extent_type<N>()) {
{} }
template <size_t N> template <size_t N>
constexpr span(std::array<element_type, N>& arr) noexcept constexpr span(std::array<element_type, N>& arr) noexcept : storage_(&arr[0], extent_type<N>())
: storage_(&arr[0], extent_type<N>()) {
{} }
template <size_t N, class = std::enable_if_t<is_const<element_type>::value>> template <size_t N, class = std::enable_if_t<is_const<element_type>::value>>
constexpr span(std::array<std::remove_const_t<element_type>, N>& arr) noexcept constexpr span(std::array<std::remove_const_t<element_type>, N>& arr) noexcept
: storage_(&arr[0], extent_type<N>()) : storage_(&arr[0], extent_type<N>())
{} {
}
template <size_t N, class = std::enable_if_t<is_const<element_type>::value>> template <size_t N, class = std::enable_if_t<is_const<element_type>::value>>
constexpr span(const std::array<std::remove_const_t<element_type>, N>& arr) noexcept constexpr span(const std::array<std::remove_const_t<element_type>, N>& arr) noexcept
: storage_(&arr[0], extent_type<N>()) : storage_(&arr[0], extent_type<N>())
{} {
}
// NB: the SFINAE here uses .data() as a incomplete/imperfect proxy for the requirement // NB: the SFINAE here uses .data() as a incomplete/imperfect proxy for the requirement
// on Container to be a contiguous sequence container. // on Container to be a contiguous sequence container.
template <class Container, template <class Container,
class = std::enable_if_t<!details::is_span<Container>::value && class = std::enable_if_t<
std::is_convertible<Container::pointer, pointer>::value &&
std::is_convertible<Container::pointer, decltype(std::declval<Container>().data())>::value>
>
constexpr span(Container& cont) : span(cont.data(), cont.size()) {}
template <class Container,
class = std::enable_if_t<std::is_const<element_type>::value &&
!details::is_span<Container>::value && !details::is_span<Container>::value &&
std::is_convertible<Container::pointer, pointer>::value && std::is_convertible<Container::pointer, pointer>::value &&
std::is_convertible<Container::pointer, decltype(std::declval<Container>().data())>::value> std::is_convertible<Container::pointer,
> decltype(std::declval<Container>().data())>::value>>
constexpr span(const Container& cont) : span(cont.data(), cont.size()) {} constexpr span(Container& cont) : span(cont.data(), cont.size())
{
}
template <class Container,
class = std::enable_if_t<
std::is_const<element_type>::value && !details::is_span<Container>::value &&
std::is_convertible<Container::pointer, pointer>::value &&
std::is_convertible<Container::pointer,
decltype(std::declval<Container>().data())>::value>>
constexpr span(const Container& cont) : span(cont.data(), cont.size())
{
}
constexpr span(const span& other) noexcept = default; constexpr span(const span& other) noexcept = default;
constexpr span(span&& other) noexcept = default; constexpr span(span&& other) noexcept = default;
template <class OtherElementType, std::ptrdiff_t OtherExtent, template <
class OtherElementType, std::ptrdiff_t OtherExtent,
class = std::enable_if_t< class = std::enable_if_t<
details::is_allowed_extent_conversion<OtherExtent, Extent>::value && details::is_allowed_extent_conversion<OtherExtent, Extent>::value &&
details::is_allowed_element_type_conversion<OtherElementType, element_type>::value details::is_allowed_element_type_conversion<OtherElementType, element_type>::value>>
>
>
constexpr span(const span<OtherElementType, OtherExtent>& other) constexpr span(const span<OtherElementType, OtherExtent>& other)
: storage_(reinterpret_cast<pointer>(other.data()), extent_type<OtherExtent>(other.size())) : storage_(reinterpret_cast<pointer>(other.data()), extent_type<OtherExtent>(other.size()))
{} {
}
template <class OtherElementType, std::ptrdiff_t OtherExtent, template <
class OtherElementType, std::ptrdiff_t OtherExtent,
class = std::enable_if_t< class = std::enable_if_t<
details::is_allowed_extent_conversion<OtherExtent, Extent>::value && details::is_allowed_extent_conversion<OtherExtent, Extent>::value &&
details::is_allowed_element_type_conversion<OtherElementType, element_type>::value details::is_allowed_element_type_conversion<OtherElementType, element_type>::value>>
>
>
constexpr span(span<OtherElementType, OtherExtent>&& other) constexpr span(span<OtherElementType, OtherExtent>&& other)
: storage_(reinterpret_cast<pointer>(other.data()), extent_type<OtherExtent>(other.size())) : storage_(reinterpret_cast<pointer>(other.data()), extent_type<OtherExtent>(other.size()))
{} {
}
~span() noexcept = default; ~span() noexcept = default;
constexpr span& operator=(const span& other) noexcept = default; constexpr span& operator=(const span& other) noexcept = default;
@ -548,8 +603,7 @@ private:
Expects(ext.size() == Extent); Expects(ext.size() == Extent);
} }
constexpr extent_type(index_type size) constexpr extent_type(index_type size) { Expects(size == Extent); }
{ Expects(size == Extent); }
constexpr inline index_type size() const noexcept { return Extent; } constexpr inline index_type size() const noexcept { return Extent; }
}; };
@ -560,13 +614,12 @@ private:
public: public:
template <index_type Other> template <index_type Other>
explicit constexpr extent_type(extent_type<Other> ext) : size_(ext.size()) explicit constexpr extent_type(extent_type<Other> ext) : size_(ext.size())
{} {
}
explicit constexpr extent_type(index_type size) : size_(size) explicit constexpr extent_type(index_type size) : size_(size) { Expects(size >= 0); }
{ Expects(size >= 0); }
constexpr inline index_type size() const noexcept constexpr inline index_type size() const noexcept { return size_; }
{ return size_; }
private: private:
index_type size_; index_type size_;
@ -580,12 +633,12 @@ private:
{ {
public: public:
template <class OtherExtentType> template <class OtherExtentType>
constexpr storage_type(pointer data, OtherExtentType ext) constexpr storage_type(pointer data, OtherExtentType ext) : ExtentType(ext), data_(data)
: ExtentType(ext), data_(data) {
{ Expects((!data && size() == 0) || (data && size() >= 0)); } Expects((!data && size() == 0) || (data && size() >= 0));
}
constexpr inline pointer data() const noexcept constexpr inline pointer data() const noexcept { return data_; }
{ return data_; }
private: private:
pointer data_; pointer data_;
@ -594,60 +647,81 @@ private:
storage_type<extent_type<Extent>> storage_; storage_type<extent_type<Extent>> storage_;
}; };
// [span.comparison], span comparison operators // [span.comparison], span comparison operators
template <class ElementType, ptrdiff_t Extent> template <class ElementType, ptrdiff_t Extent>
constexpr bool operator==(const span<ElementType, Extent>& l, const span<ElementType, Extent>& r) constexpr bool operator==(const span<ElementType, Extent>& l, const span<ElementType, Extent>& r)
{ return std::equal(l.begin(), l.end(), r.begin(), r.end()); } {
return std::equal(l.begin(), l.end(), r.begin(), r.end());
}
template <class ElementType, ptrdiff_t Extent> template <class ElementType, ptrdiff_t Extent>
constexpr bool operator!=(const span<ElementType, Extent>& l, const span<ElementType, Extent>& r) constexpr bool operator!=(const span<ElementType, Extent>& l, const span<ElementType, Extent>& r)
{ return !(l == r); } {
return !(l == r);
}
template <class ElementType, ptrdiff_t Extent> template <class ElementType, ptrdiff_t Extent>
constexpr bool operator<(const span<ElementType, Extent>& l, const span<ElementType, Extent>& r) constexpr bool operator<(const span<ElementType, Extent>& l, const span<ElementType, Extent>& r)
{ return std::lexicographical_compare(l.begin(), l.end(), r.begin(), r.end()); } {
return std::lexicographical_compare(l.begin(), l.end(), r.begin(), r.end());
}
template <class ElementType, ptrdiff_t Extent> template <class ElementType, ptrdiff_t Extent>
constexpr bool operator<=(const span<ElementType, Extent>& l, const span<ElementType, Extent>& r) constexpr bool operator<=(const span<ElementType, Extent>& l, const span<ElementType, Extent>& r)
{ return !(l > r); } {
return !(l > r);
}
template <class ElementType, ptrdiff_t Extent> template <class ElementType, ptrdiff_t Extent>
constexpr bool operator>(const span<ElementType, Extent>& l, const span<ElementType, Extent>& r) constexpr bool operator>(const span<ElementType, Extent>& l, const span<ElementType, Extent>& r)
{ return r < l; } {
return r < l;
}
template <class ElementType, ptrdiff_t Extent> template <class ElementType, ptrdiff_t Extent>
constexpr bool operator>=(const span<ElementType, Extent>& l, const span<ElementType, Extent>& r) constexpr bool operator>=(const span<ElementType, Extent>& l, const span<ElementType, Extent>& r)
{ return !(l < r); } {
return !(l < r);
}
namespace details namespace details
{ {
// if we only supported compilers with good constexpr support then // if we only supported compilers with good constexpr support then
// this pair of classes could collapse down to a constexpr function // this pair of classes could collapse down to a constexpr function
// we should use a narrow_cast<> to go to size_t, but older compilers may not see it as constexpr // we should use a narrow_cast<> to go to size_t, but older compilers may not see it as
// constexpr
// and so will fail compilation of the template // and so will fail compilation of the template
template <class ElementType, ptrdiff_t Extent> template <class ElementType, ptrdiff_t Extent>
struct calculate_byte_size : struct calculate_byte_size
std::integral_constant<std::ptrdiff_t, static_cast<ptrdiff_t>(sizeof(ElementType) * static_cast<size_t>(Extent))> : std::integral_constant<std::ptrdiff_t,
{}; static_cast<ptrdiff_t>(sizeof(ElementType) *
static_cast<size_t>(Extent))>
{
};
template <class ElementType> template <class ElementType>
struct calculate_byte_size<ElementType, dynamic_extent> : struct calculate_byte_size<ElementType, dynamic_extent>
std::integral_constant<std::ptrdiff_t, dynamic_extent> : std::integral_constant<std::ptrdiff_t, dynamic_extent>
{}; {
};
} }
// [span.objectrep], views of object representation // [span.objectrep], views of object representation
template <class ElementType, ptrdiff_t Extent> template <class ElementType, ptrdiff_t Extent>
span<const byte, details::calculate_byte_size<ElementType, Extent>::value> as_bytes(span<ElementType, Extent> s) noexcept span<const byte, details::calculate_byte_size<ElementType, Extent>::value>
{ return {reinterpret_cast<const byte*>(s.data()), s.size_bytes()}; } as_bytes(span<ElementType, Extent> s) noexcept
{
return {reinterpret_cast<const byte*>(s.data()), s.size_bytes()};
}
template <class ElementType, ptrdiff_t Extent, class = std::enable_if_t<!std::is_const<ElementType>::value>> template <class ElementType, ptrdiff_t Extent,
span<byte, details::calculate_byte_size<ElementType, Extent>::value> as_writeable_bytes(span<ElementType, Extent> s) noexcept class = std::enable_if_t<!std::is_const<ElementType>::value>>
{ return {reinterpret_cast<byte*>(s.data()), s.size_bytes()}; } span<byte, details::calculate_byte_size<ElementType, Extent>::value>
as_writeable_bytes(span<ElementType, Extent> s) noexcept
{
return {reinterpret_cast<byte*>(s.data()), s.size_bytes()};
}
} // namespace gsl } // namespace gsl

View File

@ -38,7 +38,6 @@
// more targeted suppressions will be added in a future update to the GSL // more targeted suppressions will be added in a future update to the GSL
#pragma warning(disable : 26481 26482 26483 26485 26490 26491 26492 26493 26495) #pragma warning(disable : 26481 26482 26483 26485 26490 26491 26492 26493 26495)
// VS 2013 workarounds // VS 2013 workarounds
#if _MSC_VER <= 1800 #if _MSC_VER <= 1800
@ -112,7 +111,6 @@ span<T, dynamic_extent> ensure_sentinel(T* seq, std::ptrdiff_t max = PTRDIFF_MAX
return {seq, cur - seq}; return {seq, cur - seq};
} }
// //
// ensure_z - creates a span for a czstring or cwzstring. // ensure_z - creates a span for a czstring or cwzstring.
// Will fail fast if a null-terminator cannot be found before // Will fail fast if a null-terminator cannot be found before
@ -124,7 +122,8 @@ inline span<T, dynamic_extent> ensure_z(T* const & sz, std::ptrdiff_t max = PTRD
return ensure_sentinel<T, 0>(sz, max); return ensure_sentinel<T, 0>(sz, max);
} }
// TODO (neilmac) there is probably a better template-magic way to get the const and non-const overloads to share an implementation // TODO (neilmac) there is probably a better template-magic way to get the const and non-const
// overloads to share an implementation
inline span<char, dynamic_extent> ensure_z(char* const& sz, std::ptrdiff_t max) inline span<char, dynamic_extent> ensure_z(char* const& sz, std::ptrdiff_t max)
{ {
auto len = strnlen(sz, narrow_cast<size_t>(max)); auto len = strnlen(sz, narrow_cast<size_t>(max));
@ -154,10 +153,14 @@ inline span<const wchar_t, dynamic_extent> ensure_z(const wchar_t* const& sz, st
} }
template <typename T, size_t N> template <typename T, size_t N>
span<T, dynamic_extent> ensure_z(T(&sz)[N]) { return ensure_z(&sz[0], static_cast<std::ptrdiff_t>(N)); } span<T, dynamic_extent> ensure_z(T (&sz)[N])
{
return ensure_z(&sz[0], static_cast<std::ptrdiff_t>(N));
}
template <class Cont> template <class Cont>
span<typename std::remove_pointer<typename Cont::pointer>::type, dynamic_extent> ensure_z(Cont& cont) span<typename std::remove_pointer<typename Cont::pointer>::type, dynamic_extent>
ensure_z(Cont& cont)
{ {
return ensure_z(cont.data(), static_cast<std::ptrdiff_t>(cont.length())); return ensure_z(cont.data(), static_cast<std::ptrdiff_t>(cont.length()));
} }
@ -169,19 +172,23 @@ namespace details
{ {
template <typename T> template <typename T>
struct is_basic_string_span_oracle : std::false_type struct is_basic_string_span_oracle : std::false_type
{}; {
};
template <typename CharT, std::ptrdiff_t Extent> template <typename CharT, std::ptrdiff_t Extent>
struct is_basic_string_span_oracle<basic_string_span<CharT, Extent>> : std::true_type struct is_basic_string_span_oracle<basic_string_span<CharT, Extent>> : std::true_type
{}; {
};
template <typename T> template <typename T>
struct is_basic_string_span : is_basic_string_span_oracle<std::remove_cv_t<T>> struct is_basic_string_span : is_basic_string_span_oracle<std::remove_cv_t<T>>
{}; {
};
template <typename T> template <typename T>
struct length_func struct length_func
{}; {
};
template <> template <>
struct length_func<char> struct length_func<char>
@ -220,7 +227,6 @@ namespace details
}; };
} }
// //
// string_span and relatives // string_span and relatives
// //
@ -251,9 +257,7 @@ public:
#ifndef GSL_MSVC_NO_DEFAULT_MOVE_CTOR #ifndef GSL_MSVC_NO_DEFAULT_MOVE_CTOR
constexpr basic_string_span(basic_string_span&& other) = default; constexpr basic_string_span(basic_string_span&& other) = default;
#else #else
constexpr basic_string_span(basic_string_span&& other) constexpr basic_string_span(basic_string_span&& other) : span_(std::move(other.span_)) {}
: span_(std::move(other.span_))
{}
#endif #endif
// assign // assign
@ -271,92 +275,83 @@ public:
#endif #endif
// from nullptr // from nullptr
constexpr basic_string_span(std::nullptr_t ptr) noexcept constexpr basic_string_span(std::nullptr_t ptr) noexcept : span_(ptr) {}
: span_(ptr)
{}
// from nullptr and length // from nullptr and length
constexpr basic_string_span(std::nullptr_t ptr, size_type length) noexcept constexpr basic_string_span(std::nullptr_t ptr, size_type length) noexcept : span_(ptr, length)
: span_(ptr, length) {
{} }
// From static arrays - if 0-terminated, remove 0 from the view // From static arrays - if 0-terminated, remove 0 from the view
// from static arrays and string literals // from static arrays and string literals
template <size_t N> template <size_t N>
constexpr basic_string_span(value_type(&arr)[N]) noexcept constexpr basic_string_span(value_type (&arr)[N]) noexcept : span_(remove_z(arr))
: span_(remove_z(arr)) {
{} }
// Those allow 0s within the length, so we do not remove them // Those allow 0s within the length, so we do not remove them
// from raw data and length // from raw data and length
constexpr basic_string_span(pointer ptr, size_type length) noexcept constexpr basic_string_span(pointer ptr, size_type length) noexcept : span_(ptr, length) {}
: span_(ptr, length)
{}
// from string // from string
constexpr basic_string_span(std::string& s) noexcept constexpr basic_string_span(std::string& s) noexcept
: span_(const_cast<pointer>(s.data()), narrow_cast<std::ptrdiff_t>(s.length())) : span_(const_cast<pointer>(s.data()), narrow_cast<std::ptrdiff_t>(s.length()))
{} {
}
// from containers. Containers must have .size() and .data() function signatures // from containers. Containers must have .size() and .data() function signatures
template <typename Cont, template <typename Cont,
typename = std::enable_if_t< typename = std::enable_if_t<
!details::is_basic_string_span<Cont>::value !details::is_basic_string_span<Cont>::value && !details::is_span<Cont>::value &&
&& !details::is_span<Cont>::value std::is_convertible<Cont::pointer, pointer>::value &&
&& std::is_convertible<Cont::pointer, pointer>::value std::is_convertible<Cont::pointer, decltype(std::declval<Cont>().data())>::value>>
&& std::is_convertible<Cont::pointer, decltype(std::declval<Cont>().data())>::value> constexpr basic_string_span(Cont& cont) : span_(cont.data(), cont.size())
> {
constexpr basic_string_span(Cont& cont) : span_(cont.data(), cont.size()) {} }
// disallow creation from temporary containers and strings // disallow creation from temporary containers and strings
template <typename Cont, template <typename Cont,
typename = std::enable_if_t< typename = std::enable_if_t<
!details::is_basic_string_span<Cont>::value !details::is_basic_string_span<Cont>::value && !details::is_span<Cont>::value &&
&& !details::is_span<Cont>::value std::is_convertible<Cont::pointer, pointer>::value &&
&& std::is_convertible<Cont::pointer, pointer>::value std::is_convertible<Cont::pointer, decltype(std::declval<Cont>().data())>::value>>
&& std::is_convertible<Cont::pointer, decltype(std::declval<Cont>().data())>::value> constexpr basic_string_span(const Cont& cont) : span_(cont.data(), cont.size())
> {
constexpr basic_string_span(const Cont& cont) : span_(cont.data(), cont.size()) {} }
#ifndef GSL_MSVC_HAS_SFINAE_SUBSTITUTION_ICE #ifndef GSL_MSVC_HAS_SFINAE_SUBSTITUTION_ICE
// from span // from span
template <typename OtherValueType, std::ptrdiff_t OtherExtent, template <typename OtherValueType, std::ptrdiff_t OtherExtent,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
std::is_convertible<span<OtherValueType, OtherExtent>, impl_type>::value std::is_convertible<span<OtherValueType, OtherExtent>, impl_type>::value>>
> constexpr basic_string_span(span<OtherValueType, OtherExtent> other) noexcept : span_(other)
> {
constexpr basic_string_span(span<OtherValueType, OtherExtent> other) noexcept }
: span_(other)
{}
#else #else
// from span // from span
constexpr basic_string_span(span<value_type, Extent> other) noexcept constexpr basic_string_span(span<value_type, Extent> other) noexcept : span_(other) {}
: span_(other)
{}
template <typename = std::enable_if_t<!std::is_same<std::remove_const_t<value_type>, value_type>::value>> template <typename = std::enable_if_t<
!std::is_same<std::remove_const_t<value_type>, value_type>::value>>
constexpr basic_string_span(span<std::remove_const_t<value_type>, Extent> other) noexcept constexpr basic_string_span(span<std::remove_const_t<value_type>, Extent> other) noexcept
: span_(other) : span_(other)
{} {
}
#endif #endif
// from string_span // from string_span
template <typename OtherValueType, std::ptrdiff_t OtherExtent, template <typename OtherValueType, std::ptrdiff_t OtherExtent,
typename = std::enable_if_t< typename = std::enable_if_t<std::is_convertible<
std::is_convertible<basic_string_span<OtherValueType, OtherExtent>::impl_type, impl_type>::value basic_string_span<OtherValueType, OtherExtent>::impl_type, impl_type>::value>>
>
>
constexpr basic_string_span(basic_string_span<OtherValueType, OtherExtent> other) noexcept constexpr basic_string_span(basic_string_span<OtherValueType, OtherExtent> other) noexcept
: span_(other.data(), other.length()) : span_(other.data(), other.length())
{}
constexpr bool empty() const noexcept
{ {
return length() == 0;
} }
constexpr bool empty() const noexcept { return length() == 0; }
// first Count elements // first Count elements
template <size_type Count> template <size_type Count>
constexpr basic_string_span<value_type, Count> first() const noexcept constexpr basic_string_span<value_type, Count> first() const noexcept
@ -388,87 +383,45 @@ public:
return {span_.template subspan<Offset, Count>()}; return {span_.template subspan<Offset, Count>()};
} }
constexpr basic_string_span<value_type, dynamic_extent> subspan(size_type offset, size_type count = dynamic_extent) const noexcept constexpr basic_string_span<value_type, dynamic_extent>
subspan(size_type offset, size_type count = dynamic_extent) const noexcept
{ {
return {span_.subspan(offset, count)}; return {span_.subspan(offset, count)};
} }
constexpr reference operator[](size_type idx) const noexcept constexpr reference operator[](size_type idx) const noexcept { return span_[idx]; }
{
return span_[idx];
}
constexpr pointer data() const noexcept constexpr pointer data() const noexcept { return span_.data(); }
{
return span_.data();
}
// length of the span in elements // length of the span in elements
constexpr size_type length() const noexcept constexpr size_type length() const noexcept { return span_.size(); }
{
return span_.size();
}
// length of the span in elements // length of the span in elements
constexpr size_type size() const noexcept constexpr size_type size() const noexcept { return span_.size(); }
{
return span_.size();
}
// length of the span in bytes // length of the span in bytes
constexpr size_type size_bytes() const noexcept constexpr size_type size_bytes() const noexcept { return span_.size_bytes(); }
{
return span_.size_bytes();
}
// length of the span in bytes // length of the span in bytes
constexpr size_type length_bytes() const noexcept constexpr size_type length_bytes() const noexcept { return span_.length_bytes(); }
{
return span_.length_bytes();
}
constexpr iterator begin() const noexcept constexpr iterator begin() const noexcept { return span_.begin(); }
{
return span_.begin();
}
constexpr iterator end() const noexcept constexpr iterator end() const noexcept { return span_.end(); }
{
return span_.end();
}
constexpr const_iterator cbegin() const noexcept constexpr const_iterator cbegin() const noexcept { return span_.cbegin(); }
{
return span_.cbegin();
}
constexpr const_iterator cend() const noexcept constexpr const_iterator cend() const noexcept { return span_.cend(); }
{
return span_.cend();
}
constexpr reverse_iterator rbegin() const noexcept constexpr reverse_iterator rbegin() const noexcept { return span_.rbegin(); }
{
return span_.rbegin();
}
constexpr reverse_iterator rend() const noexcept constexpr reverse_iterator rend() const noexcept { return span_.rend(); }
{
return span_.rend();
}
constexpr const_reverse_iterator crbegin() const noexcept constexpr const_reverse_iterator crbegin() const noexcept { return span_.crbegin(); }
{
return span_.crbegin();
}
constexpr const_reverse_iterator crend() const noexcept constexpr const_reverse_iterator crend() const noexcept { return span_.crend(); }
{
return span_.crend();
}
private: private:
static impl_type remove_z(pointer const& sz, std::ptrdiff_t max) noexcept static impl_type remove_z(pointer const& sz, std::ptrdiff_t max) noexcept
{ {
return {sz, details::length_func<value_type>()(sz, max)}; return {sz, details::length_func<value_type>()(sz, max)};
@ -501,7 +454,8 @@ using cwstring_span = basic_string_span<const wchar_t, Extent>;
#ifndef GSL_MSVC_HAS_TYPE_DEDUCTION_BUG #ifndef GSL_MSVC_HAS_TYPE_DEDUCTION_BUG
template <typename CharT, ptrdiff_t Extent> template <typename CharT, ptrdiff_t Extent>
std::basic_string<typename std::remove_const<CharT>::type> to_string(basic_string_span<CharT, Extent> view) std::basic_string<typename std::remove_const<CharT>::type>
to_string(basic_string_span<CharT, Extent> view)
{ {
return {view.data(), static_cast<size_t>(view.length())}; return {view.data(), static_cast<size_t>(view.length())};
} }
@ -548,8 +502,7 @@ public:
using impl_type = span<value_type, Extent>; using impl_type = span<value_type, Extent>;
using string_span_type = basic_string_span<value_type, Extent>; using string_span_type = basic_string_span<value_type, Extent>;
constexpr basic_zstring_span(impl_type s) noexcept constexpr basic_zstring_span(impl_type s) noexcept : span_(s)
: span_(s)
{ {
// expects a zero-terminated span // expects a zero-terminated span
Expects(s[s.size() - 1] == '\0'); Expects(s[s.size() - 1] == '\0');
@ -562,9 +515,7 @@ public:
#ifndef GSL_MSVC_NO_DEFAULT_MOVE_CTOR #ifndef GSL_MSVC_NO_DEFAULT_MOVE_CTOR
constexpr basic_zstring_span(basic_zstring_span&& other) = default; constexpr basic_zstring_span(basic_zstring_span&& other) = default;
#else #else
constexpr basic_zstring_span(basic_zstring_span&& other) constexpr basic_zstring_span(basic_zstring_span&& other) : span_(std::move(other.span_)) {}
: span_(std::move(other.span_))
{}
#endif #endif
// assign // assign
@ -583,7 +534,10 @@ public:
constexpr bool empty() const noexcept { return span_.size() == 0; } constexpr bool empty() const noexcept { return span_.size() == 0; }
constexpr string_span_type as_string_span() const noexcept { return span_.first(span_.size()-1); } constexpr string_span_type as_string_span() const noexcept
{
return span_.first(span_.size() - 1);
}
constexpr string_span_type ensure_z() const noexcept { return gsl::ensure_z(span_); } constexpr string_span_type ensure_z() const noexcept { return gsl::ensure_z(span_); }
@ -609,9 +563,8 @@ using cwzstring_span = basic_zstring_span<const wchar_t, Max>;
// operator == // operator ==
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename = std::enable_if_t< typename = std::enable_if_t<std::is_convertible<
std::is_convertible<T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value> T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value>>
>
bool operator==(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept bool operator==(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept
{ {
gsl::basic_string_span<std::add_const_t<CharT>, Extent> tmp(other); gsl::basic_string_span<std::add_const_t<CharT>, Extent> tmp(other);
@ -622,11 +575,11 @@ bool operator==(gsl::basic_string_span<CharT, Extent> one, const T& other) noexc
#endif #endif
} }
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <
typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
std::is_convertible<T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value std::is_convertible<T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value &&
&& !gsl::details::is_basic_string_span<T>::value> !gsl::details::is_basic_string_span<T>::value>>
>
bool operator==(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept bool operator==(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept
{ {
gsl::basic_string_span<std::add_const_t<CharT>, Extent> tmp(one); gsl::basic_string_span<std::add_const_t<CharT>, Extent> tmp(one);
@ -642,28 +595,28 @@ bool operator==(const T& one, gsl::basic_string_span<CharT, Extent> other) noexc
// VS treats temp and const containers as convertible to basic_string_span, // VS treats temp and const containers as convertible to basic_string_span,
// so the cases below are already covered by the previous operators // so the cases below are already covered by the previous operators
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <
typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename DataType = typename T::value_type, typename DataType = typename T::value_type,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
!gsl::details::is_span<T>::value !gsl::details::is_span<T>::value && !gsl::details::is_basic_string_span<T>::value &&
&& !gsl::details::is_basic_string_span<T>::value std::is_convertible<DataType*, CharT*>::value &&
&& std::is_convertible<DataType*, CharT*>::value std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>,
&& std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>, DataType>::value> DataType>::value>>
>
bool operator==(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept bool operator==(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept
{ {
gsl::basic_string_span<std::add_const_t<CharT>, Extent> tmp(other); gsl::basic_string_span<std::add_const_t<CharT>, Extent> tmp(other);
return std::equal(one.begin(), one.end(), tmp.begin(), tmp.end()); return std::equal(one.begin(), one.end(), tmp.begin(), tmp.end());
} }
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <
typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename DataType = typename T::value_type, typename DataType = typename T::value_type,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
!gsl::details::is_span<T>::value !gsl::details::is_span<T>::value && !gsl::details::is_basic_string_span<T>::value &&
&& !gsl::details::is_basic_string_span<T>::value std::is_convertible<DataType*, CharT*>::value &&
&& std::is_convertible<DataType*, CharT*>::value std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>,
&& std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>, DataType>::value> DataType>::value>>
>
bool operator==(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept bool operator==(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept
{ {
gsl::basic_string_span<std::add_const_t<CharT>, Extent> tmp(one); gsl::basic_string_span<std::add_const_t<CharT>, Extent> tmp(one);
@ -673,19 +626,18 @@ bool operator==(const T& one, gsl::basic_string_span<CharT, Extent> other) noexc
// operator != // operator !=
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename = std::enable_if_t< typename = std::enable_if_t<std::is_convertible<
std::is_convertible<T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value> T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value>>
>
bool operator!=(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept bool operator!=(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept
{ {
return !(one == other); return !(one == other);
} }
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <
typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
std::is_convertible<T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value std::is_convertible<T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value &&
&& !gsl::details::is_basic_string_span<T>::value> !gsl::details::is_basic_string_span<T>::value>>
>
bool operator!=(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept bool operator!=(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept
{ {
return !(one == other); return !(one == other);
@ -696,27 +648,27 @@ bool operator!=(const T& one, gsl::basic_string_span<CharT, Extent> other) noexc
// VS treats temp and const containers as convertible to basic_string_span, // VS treats temp and const containers as convertible to basic_string_span,
// so the cases below are already covered by the previous operators // so the cases below are already covered by the previous operators
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <
typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename DataType = typename T::value_type, typename DataType = typename T::value_type,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
!gsl::details::is_span<T>::value !gsl::details::is_span<T>::value && !gsl::details::is_basic_string_span<T>::value &&
&& !gsl::details::is_basic_string_span<T>::value std::is_convertible<DataType*, CharT*>::value &&
&& std::is_convertible<DataType*, CharT*>::value std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>,
&& std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>, DataType>::value> DataType>::value>>
>
bool operator!=(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept bool operator!=(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept
{ {
return !(one == other); return !(one == other);
} }
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <
typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename DataType = typename T::value_type, typename DataType = typename T::value_type,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
!gsl::details::is_span<T>::value !gsl::details::is_span<T>::value && !gsl::details::is_basic_string_span<T>::value &&
&& !gsl::details::is_basic_string_span<T>::value std::is_convertible<DataType*, CharT*>::value &&
&& std::is_convertible<DataType*, CharT*>::value std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>,
&& std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>, DataType>::value> DataType>::value>>
>
bool operator!=(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept bool operator!=(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept
{ {
return !(one == other); return !(one == other);
@ -725,20 +677,19 @@ bool operator!=(const T& one, gsl::basic_string_span<CharT, Extent> other) noexc
// operator< // operator<
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename = std::enable_if_t< typename = std::enable_if_t<std::is_convertible<
std::is_convertible<T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value> T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value>>
>
bool operator<(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept bool operator<(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept
{ {
gsl::basic_string_span<std::add_const_t<CharT>, Extent> tmp(other); gsl::basic_string_span<std::add_const_t<CharT>, Extent> tmp(other);
return std::lexicographical_compare(one.begin(), one.end(), tmp.begin(), tmp.end()); return std::lexicographical_compare(one.begin(), one.end(), tmp.begin(), tmp.end());
} }
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <
typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
std::is_convertible<T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value std::is_convertible<T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value &&
&& !gsl::details::is_basic_string_span<T>::value> !gsl::details::is_basic_string_span<T>::value>>
>
bool operator<(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept bool operator<(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept
{ {
gsl::basic_string_span<std::add_const_t<CharT>, Extent> tmp(one); gsl::basic_string_span<std::add_const_t<CharT>, Extent> tmp(one);
@ -750,28 +701,28 @@ bool operator<(const T& one, gsl::basic_string_span<CharT, Extent> other) noexce
// VS treats temp and const containers as convertible to basic_string_span, // VS treats temp and const containers as convertible to basic_string_span,
// so the cases below are already covered by the previous operators // so the cases below are already covered by the previous operators
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <
typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename DataType = typename T::value_type, typename DataType = typename T::value_type,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
!gsl::details::is_span<T>::value !gsl::details::is_span<T>::value && !gsl::details::is_basic_string_span<T>::value &&
&& !gsl::details::is_basic_string_span<T>::value std::is_convertible<DataType*, CharT*>::value &&
&& std::is_convertible<DataType*, CharT*>::value std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>,
&& std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>, DataType>::value> DataType>::value>>
>
bool operator<(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept bool operator<(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept
{ {
gsl::basic_string_span<std::add_const_t<CharT>, Extent> tmp(other); gsl::basic_string_span<std::add_const_t<CharT>, Extent> tmp(other);
return std::lexicographical_compare(one.begin(), one.end(), tmp.begin(), tmp.end()); return std::lexicographical_compare(one.begin(), one.end(), tmp.begin(), tmp.end());
} }
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <
typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename DataType = typename T::value_type, typename DataType = typename T::value_type,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
!gsl::details::is_span<T>::value !gsl::details::is_span<T>::value && !gsl::details::is_basic_string_span<T>::value &&
&& !gsl::details::is_basic_string_span<T>::value std::is_convertible<DataType*, CharT*>::value &&
&& std::is_convertible<DataType*, CharT*>::value std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>,
&& std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>, DataType>::value> DataType>::value>>
>
bool operator<(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept bool operator<(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept
{ {
gsl::basic_string_span<std::add_const_t<CharT>, Extent> tmp(one); gsl::basic_string_span<std::add_const_t<CharT>, Extent> tmp(one);
@ -781,19 +732,18 @@ bool operator<(const T& one, gsl::basic_string_span<CharT, Extent> other) noexce
// operator <= // operator <=
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename = std::enable_if_t< typename = std::enable_if_t<std::is_convertible<
std::is_convertible<T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value> T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value>>
>
bool operator<=(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept bool operator<=(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept
{ {
return !(other < one); return !(other < one);
} }
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <
typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
std::is_convertible<T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value std::is_convertible<T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value &&
&& !gsl::details::is_basic_string_span<T>::value> !gsl::details::is_basic_string_span<T>::value>>
>
bool operator<=(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept bool operator<=(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept
{ {
return !(other < one); return !(other < one);
@ -804,27 +754,27 @@ bool operator<=(const T& one, gsl::basic_string_span<CharT, Extent> other) noexc
// VS treats temp and const containers as convertible to basic_string_span, // VS treats temp and const containers as convertible to basic_string_span,
// so the cases below are already covered by the previous operators // so the cases below are already covered by the previous operators
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <
typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename DataType = typename T::value_type, typename DataType = typename T::value_type,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
!gsl::details::is_span<T>::value !gsl::details::is_span<T>::value && !gsl::details::is_basic_string_span<T>::value &&
&& !gsl::details::is_basic_string_span<T>::value std::is_convertible<DataType*, CharT*>::value &&
&& std::is_convertible<DataType*, CharT*>::value std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>,
&& std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>, DataType>::value> DataType>::value>>
>
bool operator<=(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept bool operator<=(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept
{ {
return !(other < one); return !(other < one);
} }
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <
typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename DataType = typename T::value_type, typename DataType = typename T::value_type,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
!gsl::details::is_span<T>::value !gsl::details::is_span<T>::value && !gsl::details::is_basic_string_span<T>::value &&
&& !gsl::details::is_basic_string_span<T>::value std::is_convertible<DataType*, CharT*>::value &&
&& std::is_convertible<DataType*, CharT*>::value std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>,
&& std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>, DataType>::value> DataType>::value>>
>
bool operator<=(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept bool operator<=(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept
{ {
return !(other < one); return !(other < one);
@ -833,19 +783,18 @@ bool operator<=(const T& one, gsl::basic_string_span<CharT, Extent> other) noexc
// operator> // operator>
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename = std::enable_if_t< typename = std::enable_if_t<std::is_convertible<
std::is_convertible<T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value> T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value>>
>
bool operator>(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept bool operator>(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept
{ {
return other < one; return other < one;
} }
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <
typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
std::is_convertible<T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value std::is_convertible<T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value &&
&& !gsl::details::is_basic_string_span<T>::value> !gsl::details::is_basic_string_span<T>::value>>
>
bool operator>(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept bool operator>(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept
{ {
return other < one; return other < one;
@ -856,27 +805,27 @@ bool operator>(const T& one, gsl::basic_string_span<CharT, Extent> other) noexce
// VS treats temp and const containers as convertible to basic_string_span, // VS treats temp and const containers as convertible to basic_string_span,
// so the cases below are already covered by the previous operators // so the cases below are already covered by the previous operators
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <
typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename DataType = typename T::value_type, typename DataType = typename T::value_type,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
!gsl::details::is_span<T>::value !gsl::details::is_span<T>::value && !gsl::details::is_basic_string_span<T>::value &&
&& !gsl::details::is_basic_string_span<T>::value std::is_convertible<DataType*, CharT*>::value &&
&& std::is_convertible<DataType*, CharT*>::value std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>,
&& std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>, DataType>::value> DataType>::value>>
>
bool operator>(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept bool operator>(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept
{ {
return other < one; return other < one;
} }
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <
typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename DataType = typename T::value_type, typename DataType = typename T::value_type,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
!gsl::details::is_span<T>::value !gsl::details::is_span<T>::value && !gsl::details::is_basic_string_span<T>::value &&
&& !gsl::details::is_basic_string_span<T>::value std::is_convertible<DataType*, CharT*>::value &&
&& std::is_convertible<DataType*, CharT*>::value std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>,
&& std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>, DataType>::value> DataType>::value>>
>
bool operator>(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept bool operator>(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept
{ {
return other < one; return other < one;
@ -885,19 +834,18 @@ bool operator>(const T& one, gsl::basic_string_span<CharT, Extent> other) noexce
// operator >= // operator >=
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename = std::enable_if_t< typename = std::enable_if_t<std::is_convertible<
std::is_convertible<T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value> T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value>>
>
bool operator>=(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept bool operator>=(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept
{ {
return !(one < other); return !(one < other);
} }
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <
typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
std::is_convertible<T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value std::is_convertible<T, gsl::basic_string_span<std::add_const_t<CharT>, Extent>>::value &&
&& !gsl::details::is_basic_string_span<T>::value> !gsl::details::is_basic_string_span<T>::value>>
>
bool operator>=(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept bool operator>=(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept
{ {
return !(one < other); return !(one < other);
@ -908,27 +856,27 @@ bool operator>=(const T& one, gsl::basic_string_span<CharT, Extent> other) noexc
// VS treats temp and const containers as convertible to basic_string_span, // VS treats temp and const containers as convertible to basic_string_span,
// so the cases below are already covered by the previous operators // so the cases below are already covered by the previous operators
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <
typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename DataType = typename T::value_type, typename DataType = typename T::value_type,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
!gsl::details::is_span<T>::value !gsl::details::is_span<T>::value && !gsl::details::is_basic_string_span<T>::value &&
&& !gsl::details::is_basic_string_span<T>::value std::is_convertible<DataType*, CharT*>::value &&
&& std::is_convertible<DataType*, CharT*>::value std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>,
&& std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>, DataType>::value> DataType>::value>>
>
bool operator>=(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept bool operator>=(gsl::basic_string_span<CharT, Extent> one, const T& other) noexcept
{ {
return !(one < other); return !(one < other);
} }
template <typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T, template <
typename CharT, std::ptrdiff_t Extent = gsl::dynamic_extent, typename T,
typename DataType = typename T::value_type, typename DataType = typename T::value_type,
typename Dummy = std::enable_if_t< typename Dummy = std::enable_if_t<
!gsl::details::is_span<T>::value !gsl::details::is_span<T>::value && !gsl::details::is_basic_string_span<T>::value &&
&& !gsl::details::is_basic_string_span<T>::value std::is_convertible<DataType*, CharT*>::value &&
&& std::is_convertible<DataType*, CharT*>::value std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>,
&& std::is_same<std::decay_t<decltype(std::declval<T>().size(), *std::declval<T>().data())>, DataType>::value> DataType>::value>>
>
bool operator>=(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept bool operator>=(const T& one, gsl::basic_string_span<CharT, Extent> other) noexcept
{ {
return !(one < other); return !(one < other);