From 383dc507a4b9385d24218fed70a4fd0be74df4a0 Mon Sep 17 00:00:00 2001 From: Neil MacIntosh Date: Mon, 14 Sep 2015 15:41:40 -0700 Subject: [PATCH] Fixes for review feedback. --- include/array_view.h | 4 ++-- tests/array_view_tests.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/array_view.h b/include/array_view.h index 9c58ab2..ddf6677 100644 --- a/include/array_view.h +++ b/include/array_view.h @@ -1654,7 +1654,7 @@ public: using typename Base::iterator; using typename Base::const_iterator; using typename Base::reference; - using Base::rank; + using Base::rank; public: // basic @@ -2058,7 +2058,7 @@ private: const ArrayView * m_validator; void validateThis() const { - fail_fast_assert(m_pdata >= m_validator->m_pdata && m_pdata < m_validator->m_pdata + m_validator->size()); + fail_fast_assert(m_pdata >= m_validator->m_pdata && m_pdata < m_validator->m_pdata + m_validator->size(), "iterator is out of range of the array"); } contiguous_array_view_iterator (const ArrayView *container, bool isbegin = false) : m_pdata(isbegin ? container->m_pdata : container->m_pdata + container->size()), m_validator(container) { } diff --git a/tests/array_view_tests.cpp b/tests/array_view_tests.cpp index ec1d31d..12344d9 100644 --- a/tests/array_view_tests.cpp +++ b/tests/array_view_tests.cpp @@ -321,9 +321,9 @@ SUITE(array_view_tests) CHECK(sav[1] == 2); #if _MSC_VER > 1800 - strided_array_view sav_c{ array_view{src}, strided_bounds<1>{2, 1} }; + strided_array_view sav_c{ {src}, {2, 1} }; #else - strided_array_view sav_c{ array_view{src}, strided_bounds<1>{2, 1} }; + strided_array_view sav_c{ array_view{src}, strided_bounds<1>{2, 1} }; #endif CHECK(sav_c.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav_c.bounds().strides() == index<1>{ 1 }); @@ -341,7 +341,7 @@ SUITE(array_view_tests) #if _MSC_VER > 1800 strided_array_view sav_cv{ {src}, {2, 1} }; #else - strided_array_view sav_cv{ array_view{src}, strided_bounds<1>{2, 1} }; + strided_array_view sav_cv{ array_view{src}, strided_bounds<1>{2, 1} }; #endif CHECK(sav_cv.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav_cv.bounds().strides() == index<1>{ 1 });