diff options
| author | Anna Gringauze <annagrin@microsoft.com> | 2015-11-11 12:41:11 -0800 |
|---|---|---|
| committer | Anna Gringauze <annagrin@microsoft.com> | 2015-11-13 12:52:02 -0800 |
| commit | 8aa42487225a537ddedac668ec14e179bb481935 (patch) | |
| tree | 4eebd1b7532713b48ff97f1c3322ad593abee47d /tests/span_tests.cpp | |
| parent | dc25994ed7e56ac15b67a47611ea1aeafbf4b06f (diff) | |
| download | platform_external_Microsoft-GSL-8aa42487225a537ddedac668ec14e179bb481935.tar.gz platform_external_Microsoft-GSL-8aa42487225a537ddedac668ec14e179bb481935.tar.bz2 platform_external_Microsoft-GSL-8aa42487225a537ddedac668ec14e179bb481935.zip | |
Removing basic_span base class from span
Diffstat (limited to 'tests/span_tests.cpp')
| -rw-r--r-- | tests/span_tests.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/tests/span_tests.cpp b/tests/span_tests.cpp index 6a67b02..ecb2c4e 100644 --- a/tests/span_tests.cpp +++ b/tests/span_tests.cpp @@ -323,28 +323,29 @@ SUITE(span_tests) CHECK(sav[1] == 2); #if _MSC_VER > 1800 - strided_span<const int, 1> sav_c{ {src}, {2, 1} }; -#else + //strided_span<const int, 1> sav_c{ {src}, {2, 1} }; strided_span<const int, 1> sav_c{ span<const int>{src}, strided_bounds<1>{2, 1} }; -#endif +#else + strided_span<const int, 1> sav_c{ span<const int>{src}, strided_bounds<1>{2, 1} }; +#endif CHECK(sav_c.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav_c.bounds().strides() == index<1>{ 1 }); CHECK(sav_c[1] == 2); #if _MSC_VER > 1800 strided_span<volatile int, 1> sav_v{ {src}, {2, 1} }; -#else +#else strided_span<volatile int, 1> sav_v{ span<volatile int>{src}, strided_bounds<1>{2, 1} }; -#endif +#endif CHECK(sav_v.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav_v.bounds().strides() == index<1>{ 1 }); CHECK(sav_v[1] == 2); #if _MSC_VER > 1800 strided_span<const volatile int, 1> sav_cv{ {src}, {2, 1} }; -#else +#else strided_span<const volatile int, 1> sav_cv{ span<const volatile int>{src}, strided_bounds<1>{2, 1} }; -#endif +#endif CHECK(sav_cv.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav_cv.bounds().strides() == index<1>{ 1 }); CHECK(sav_cv[1] == 2); @@ -363,7 +364,7 @@ SUITE(span_tests) strided_span<const volatile int, 1> sav_cv{ {src}, {2, 1} }; #else strided_span<const volatile int, 1> sav_cv{ span<const volatile int>{src}, strided_bounds<1>{2, 1} }; -#endif +#endif CHECK(sav_cv.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav_cv.bounds().strides() == index<1>{ 1 }); @@ -383,7 +384,7 @@ SUITE(span_tests) strided_span<const volatile int, 1> sav_cv{ {src}, {2, 1} }; #else strided_span<const volatile int, 1> sav_cv{ span<const volatile int>{src}, strided_bounds<1>{2, 1} }; -#endif +#endif CHECK(sav_cv.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav_cv.bounds().strides() == index<1>{ 1 }); CHECK(sav_cv[1] == 2); |