diff options
author | Neil MacIntosh <neilmac@microsoft.com> | 2016-06-26 17:00:56 +0300 |
---|---|---|
committer | Neil MacIntosh <neilmac@microsoft.com> | 2016-06-26 17:00:56 +0300 |
commit | 267472449c2ff450aff9ae068d4a8c93651f310f (patch) | |
tree | 318a8e8998d3a4c3399d15da230b7d051708ecf1 /tests | |
parent | b72d7abfb05aab6e3be88d414811473cb9394465 (diff) |
Renamed byte header and tidied up string_span dependencies.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/byte_tests.cpp | 2 | ||||
-rw-r--r-- | tests/string_span_tests.cpp | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/tests/byte_tests.cpp b/tests/byte_tests.cpp index ff91e50..19456fd 100644 --- a/tests/byte_tests.cpp +++ b/tests/byte_tests.cpp @@ -15,7 +15,7 @@ /////////////////////////////////////////////////////////////////////////////// #include <UnitTest++/UnitTest++.h> -#include <byte.h> +#include <gsl_byte.h> #include <iostream> #include <list> diff --git a/tests/string_span_tests.cpp b/tests/string_span_tests.cpp index 6876253..f380be3 100644 --- a/tests/string_span_tests.cpp +++ b/tests/string_span_tests.cpp @@ -142,7 +142,7 @@ SUITE(string_span_tests) const char* ptr = "Hello"; const std::string str = "Hello"; const std::vector<char> vec = { 'H', 'e', 'l', 'l', 'o' }; - gsl::multi_span<const char> sp = ensure_z("Hello"); + gsl::span<const char> sp = ensure_z("Hello"); // comparison to literal CHECK(span == cstring_span<>("Hello")); @@ -182,7 +182,7 @@ SUITE(string_span_tests) char* ptr = ar; std::string str = "Hello"; std::vector<char> vec = { 'H', 'e', 'l', 'l', 'o' }; - gsl::multi_span<char> sp = ensure_z(ar1); + gsl::span<char> sp = ensure_z(ar1); // comparison to static array with no null termination CHECK(span == string_span<>(ar)); @@ -216,7 +216,7 @@ SUITE(string_span_tests) const char ar2[10] = "Hello"; const std::string str = "Hello"; const std::vector<char> vec = { 'H', 'e', 'l', 'l', 'o' }; - gsl::multi_span<const char> sp = ensure_z("Hello"); + gsl::span<const char> sp = ensure_z("Hello"); cstring_span<> span = "Hello"; @@ -253,7 +253,7 @@ SUITE(string_span_tests) char* _ptr = _ar; std::string _str = "Hello"; std::vector<char> _vec = { 'H', 'e', 'l', 'l', 'o' }; - gsl::multi_span<char> _sp{ _ar, 5 }; + gsl::span<char> _sp{ _ar, 5 }; CHECK(span == _ar); CHECK(span == _ar1); @@ -447,7 +447,7 @@ SUITE(string_span_tests) // from span of a final extent { - multi_span<const char, 6> sp = "Hello"; + span<const char, 6> sp = "Hello"; cstring_span<> span = sp; CHECK(span.length() == 6); } @@ -455,7 +455,7 @@ SUITE(string_span_tests) // from const span of a final extent to non-const string_span #ifdef CONFIRM_COMPILATION_ERRORS { - multi_span<const char, 6> sp = "Hello"; + span<const char, 6> sp = "Hello"; string_span<> span = sp; CHECK(span.length() == 6); } @@ -568,7 +568,7 @@ SUITE(string_span_tests) // from const span { std::vector<char> vec = { 'H', 'e', 'l', 'l', 'o' }; - const multi_span<const char> inner = vec; + const span<const char> inner = vec; cstring_span<> span = inner; CHECK(span.length() == 5); } @@ -576,7 +576,7 @@ SUITE(string_span_tests) // from non-const span { std::vector<char> vec = { 'H', 'e', 'l', 'l', 'o' }; - multi_span<char> inner = vec; + span<char> inner = vec; cstring_span<> span = inner; CHECK(span.length() == 5); } @@ -675,7 +675,7 @@ SUITE(string_span_tests) { #ifdef CONFIRM_COMPILATION_ERRORS std::vector<char> vec = { 'H', 'e', 'l', 'l', 'o' }; - const multi_span<const char> inner = vec; + const span<const char> inner = vec; string_span<> span = inner; CHECK(span.length() == 5); #endif @@ -684,7 +684,7 @@ SUITE(string_span_tests) // from non-const span { std::vector<char> vec = { 'H', 'e', 'l', 'l', 'o' }; - multi_span<char> inner = vec; + span<char> inner = vec; string_span<> span = inner; CHECK(span.length() == 5); } @@ -693,7 +693,7 @@ SUITE(string_span_tests) { #ifdef CONFIRM_COMPILATION_ERRORS const std::vector<char> vec = { 'H', 'e', 'l', 'l', 'o' }; - const multi_span<char> inner = vec; + const span<char> inner = vec; string_span<> span = inner; CHECK(span.length() == 5); #endif @@ -746,7 +746,7 @@ SUITE(string_span_tests) T create() { return T{}; } template <class T> - void use(basic_string_span<T, gsl::dynamic_range> s) {} + void use(basic_string_span<T, gsl::dynamic_extent> s) {} TEST(MoveConstructors) { @@ -769,12 +769,12 @@ SUITE(string_span_tests) // move span { - multi_span<const char> span = ensure_z("Hello"); + span<const char> span = ensure_z("Hello"); cstring_span<> span1 = std::move(span); CHECK(span1.length() == 5); } { - multi_span<const char> span = ensure_z("Hello"); + span<const char> span = ensure_z("Hello"); cstring_span<> span2 = move_wrapper(std::move(span)); CHECK(span2.length() == 5); } |