From e6fab164aeb82ff3107fe8e36c9e15dd05ed4e75 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 22 Aug 2015 20:43:04 +0000 Subject: [PATCH] Remove valptridx internal use of operator-(ptr,array) --- common/include/valptridx.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/include/valptridx.h b/common/include/valptridx.h index 8f8bb16c4..de7d399b8 100644 --- a/common/include/valptridx.h +++ b/common/include/valptridx.h @@ -183,7 +183,7 @@ void valptridx::check_null_pointer(const_pointer_type p, const arr template void valptridx::check_implicit_index_range_ref(const managed_type &r, const array_managed_type &a) { - check_explicit_index_range_ref(r, &r - a, a); + check_explicit_index_range_ref(r, &r - &a.front(), a); } template @@ -560,7 +560,7 @@ public: * vptr_type to avoid checking again. */ vptr_type((check_null_pointer(p, a), *p), a), - vidx_type(p - a, a) + vidx_type(p - &a.front(), a) { } basic_ptridx(pointer_type p, index_type i, array_managed_type &a) :