Renaming array_view and string_view, as per WG21 discussions.

This commit is contained in:
Neil MacIntosh committed 2015-11-04 12:42:27 -08:00
1 parent 54f832115b
commit b63ec949e9
7 files changed
+495 -498

No files matched your search

+2 -2
View File
@@ -43,8 +43,8 @@ function(add_gsl_test name)
)
endfunction()
add_gsl_test(array_view_tests)
add_gsl_test(string_view_tests)
add_gsl_test(span_tests)
add_gsl_test(string_span_tests)
add_gsl_test(at_tests)
add_gsl_test(bounds_tests)
add_gsl_test(notnull_tests)
+2 -2
View File
@@ -15,7 +15,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <UnitTest++/UnitTest++.h>
#include <array_view.h>
#include <span.h>
#include <vector>
using namespace std;
@@ -55,7 +55,7 @@ SUITE(bounds_test)
auto itr = bounds.begin();
#ifdef CONFIRM_COMPILATION_ERRORS
array_view<int, 4, dynamic_range, 2> av(nullptr, bounds);
span<int, 4, dynamic_range, 2> av(nullptr, bounds);
auto itr2 = av.cbegin();
File diff suppressed because it is too large. Load diff
@@ -15,38 +15,38 @@
///////////////////////////////////////////////////////////////////////////////
#include <UnitTest++/UnitTest++.h>
#include <string_view.h>
#include <string_span.h>
#include <vector>
#include <cstdlib>
using namespace std;
using namespace gsl;
SUITE(string_view_tests)
SUITE(string_span_tests)
{
TEST(TestLiteralConstruction)
{
cwstring_view<> v = ensure_z(L"Hello");
cwstring_span<> v = ensure_z(L"Hello");
CHECK(5 == v.length());
#ifdef CONFIRM_COMPILATION_ERRORS
wstring_view<> v2 = ensure0(L"Hello");
wstring_span<> v2 = ensure0(L"Hello");
#endif
}
TEST(TestConstructFromStdString)
{
std::string s = "Hello there world";
cstring_view<> v = s;
cstring_span<> v = s;
CHECK(v.length() == s.length());
}
TEST(TestConstructFromStdVector)
{
std::vector<char> vec(5, 'h');
string_view<> v = vec;
string_span<> v = vec;
CHECK(v.length() == vec.size());
}
@@ -55,25 +55,25 @@ SUITE(string_view_tests)
wchar_t stack_string[] = L"Hello";
{
cwstring_view<> v = ensure_z(stack_string);
cwstring_span<> v = ensure_z(stack_string);
CHECK(v.length() == 5);
CHECK(v.used_length() == v.length());
}
{
cwstring_view<> v = stack_string;
cwstring_span<> v = stack_string;
CHECK(v.length() == 6);
CHECK(v.used_length() == v.length());
}
{
wstring_view<> v = ensure_z(stack_string);
wstring_span<> v = ensure_z(stack_string);
CHECK(v.length() == 5);
CHECK(v.used_length() == v.length());
}
{
wstring_view<> v = stack_string;
wstring_span<> v = stack_string;
CHECK(v.length() == 6);
CHECK(v.used_length() == v.length());
}
@@ -82,7 +82,7 @@ SUITE(string_view_tests)
TEST(TestConstructFromConstCharPointer)
{
const char* s = "Hello";
cstring_view<> v = ensure_z(s);
cstring_span<> v = ensure_z(s);
CHECK(v.length() == 5);
CHECK(v.used_length() == v.length());
}
@@ -90,18 +90,18 @@ SUITE(string_view_tests)
TEST(TestConversionToConst)
{
char stack_string[] = "Hello";
string_view<> v = ensure_z(stack_string);
cstring_view<> v2 = v;
string_span<> v = ensure_z(stack_string);
cstring_span<> v2 = v;
CHECK(v.length() == v2.length());
}
TEST(TestConversionFromConst)
{
char stack_string[] = "Hello";
cstring_view<> v = ensure_z(stack_string);
cstring_span<> v = ensure_z(stack_string);
#ifdef CONFIRM_COMPILATION_ERRORS
string_view<> v2 = v;
string_view<> v3 = "Hello";
string_span<> v2 = v;
string_span<> v3 = "Hello";
#endif
}
}