para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #891 from JordanMaples/dev/jomaples/missing_span_ctad

Browse Source 
Adding missing span deduction guides
This commit is contained in:
Jordan Maples [MSFT] 2020-05-29 16:47:08 -07:00 committed by GitHub
commit 794d7bb69b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/gsl/span
View File

@ -740,6 +740,14 @@ span(std::array<Type, Size>&)->span<Type, Size>;
template <class Type, std::size_t Size> template <class Type, std::size_t Size>
span(const std::array<Type, Size>&)->span<const Type, Size>; span(const std::array<Type, Size>&)->span<const Type, Size>;
template <class Container,
class Element = std::remove_pointer_t<decltype(std::declval<Container&>().data())>>
span(Container&)->span<Element>;
template <class Container,
class Element = std::remove_pointer_t<decltype(std::declval<const Container&>().data())>>
span(const Container&)->span<Element>;
#endif // ( defined(__cpp_deduction_guides) && (__cpp_deduction_guides >= 201611L) ) #endif // ( defined(__cpp_deduction_guides) && (__cpp_deduction_guides >= 201611L) )
#if defined(GSL_USE_STATIC_CONSTEXPR_WORKAROUND) #if defined(GSL_USE_STATIC_CONSTEXPR_WORKAROUND)

34
tests/span_tests.cpp
View File

@ -31,6 +31,16 @@
#include <vector> // for vector #include <vector> // for vector
#include <utility> #include <utility>
// the string_view include and macro are used in the deduction guide verification
#if (defined(__cpp_deduction_guides) && (__cpp_deduction_guides >= 201611L))
#ifdef __has_include
#if __has_include(<string_view>)
#include <string_view>
#define HAS_STRING_VIEW
#endif // __has_include(<string_view>)
#endif // __has_include
#endif // (defined(__cpp_deduction_guides) && (__cpp_deduction_guides >= 201611L))
using namespace std; using namespace std;
using namespace gsl; using namespace gsl;
@ -1227,6 +1237,30 @@ TEST(span_test, from_array_constructor)
EXPECT_FALSE((std::is_default_constructible<span<int, 42>>::value)); EXPECT_FALSE((std::is_default_constructible<span<int, 42>>::value));
} }
TEST(span_test, std_container_ctad)
{
#if (defined(__cpp_deduction_guides) && (__cpp_deduction_guides >= 201611L))
// this test is just to verify that these compile
{
std::vector<int> v{1,2,3,4};
gsl::span sp{v};
static_assert(std::is_same<decltype(sp), gsl::span<int>>::value);
}
{
std::string str{"foo"};
gsl::span sp{str};
static_assert(std::is_same<decltype(sp), gsl::span<char>>::value);
}
#ifdef HAS_STRING_VIEW
{
std::string_view sv{"foo"};
gsl::span sp{sv};
static_assert(std::is_same<decltype(sp), gsl::span<const char>>::value);
}
#endif
#endif
}
TEST(span_test, front_back) TEST(span_test, front_back)
{ {
int arr[5] = {1,2,3,4,5}; int arr[5] = {1,2,3,4,5};