mirror of
https://github.com/microsoft/GSL.git
synced 2024-11-03 17:56:43 -05:00
Add span construction from unique_ptr and shared_ptr
This patch adds support for std::unique_ptr and std::shared_ptr to the gsl::span class instead of having to manually grab the pointer via get(). For reference, this is part of the following issue: https://github.com/Microsoft/GSL/issues/402
This commit is contained in:
parent
d641796b21
commit
2b51b8767a
7
gsl/span
7
gsl/span
@ -29,6 +29,7 @@
|
|||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
|
|
||||||
@ -386,6 +387,12 @@ public:
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<class ArrayElementType = std::add_pointer<element_type>>
|
||||||
|
constexpr span(const std::unique_ptr<ArrayElementType>& ptr, index_type count) : storage_(ptr.get(), count) {}
|
||||||
|
|
||||||
|
constexpr span(const std::unique_ptr<ElementType>& ptr) : storage_(ptr.get(), ptr.get() ? 1 : 0) {}
|
||||||
|
constexpr span(const std::shared_ptr<ElementType>& ptr) : storage_(ptr.get(), ptr.get() ? 1 : 0) {}
|
||||||
|
|
||||||
// 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,
|
||||||
|
@ -483,6 +483,72 @@ SUITE(span_tests)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST(from_unique_pointer_construction)
|
||||||
|
{
|
||||||
|
{
|
||||||
|
auto ptr = std::make_unique<int>(4);
|
||||||
|
|
||||||
|
{
|
||||||
|
span<int> s{ptr};
|
||||||
|
CHECK(s.length() == 1 && s.data() == ptr.get());
|
||||||
|
CHECK(s[0] == 4);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
auto ptr = std::unique_ptr<int>{nullptr};
|
||||||
|
|
||||||
|
{
|
||||||
|
span<int> s{ptr};
|
||||||
|
CHECK(s.length() == 0 && s.data() == nullptr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
auto arr = std::make_unique<int[]>(4);
|
||||||
|
|
||||||
|
for (auto i = 0; i < 4; i++)
|
||||||
|
arr[i] = i + 1;
|
||||||
|
|
||||||
|
{
|
||||||
|
span<int> s{arr, 4};
|
||||||
|
CHECK(s.length() == 4 && s.data() == arr.get());
|
||||||
|
CHECK(s[0] == 1 && s[1] == 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
auto ptr = std::unique_ptr<int[]>{nullptr};
|
||||||
|
|
||||||
|
{
|
||||||
|
span<int> s{ptr, 0};
|
||||||
|
CHECK(s.length() == 0 && s.data() == nullptr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(from_shared_pointer_construction)
|
||||||
|
{
|
||||||
|
{
|
||||||
|
auto ptr = std::make_shared<int>(4);
|
||||||
|
|
||||||
|
{
|
||||||
|
span<int> s{ptr};
|
||||||
|
CHECK(s.length() == 1 && s.data() == ptr.get());
|
||||||
|
CHECK(s[0] == 4);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
auto ptr = std::shared_ptr<int>{nullptr};
|
||||||
|
|
||||||
|
{
|
||||||
|
span<int> s{ptr};
|
||||||
|
CHECK(s.length() == 0 && s.data() == nullptr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
TEST(from_container_constructor)
|
TEST(from_container_constructor)
|
||||||
{
|
{
|
||||||
std::vector<int> v = {1, 2, 3};
|
std::vector<int> v = {1, 2, 3};
|
||||||
|
Loading…
Reference in New Issue
Block a user