From fcaf42209269250b584cffed06dbe11df914b150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Sat, 25 Jun 2016 11:19:32 +0200 Subject: [PATCH] Disable ADL for as_const, it triggers ambiguities in VC14 --- test/container_common_tests.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/container_common_tests.hpp b/test/container_common_tests.hpp index af57eb6..63e1547 100644 --- a/test/container_common_tests.hpp +++ b/test/container_common_tests.hpp @@ -32,8 +32,8 @@ bool test_nth_index_of(Container &c) //index 0 it = c.nth(0); sz = c.index_of(it); - cit = as_const(c).nth(0); - csz = as_const(c).index_of(cit); + cit = (as_const)(c).nth(0); + csz = (as_const)(c).index_of(cit); if(it != c.begin()) return false; @@ -48,8 +48,8 @@ bool test_nth_index_of(Container &c) const typename Container::size_type sz_div_2 = c.size()/2; it = c.nth(sz_div_2); sz = c.index_of(it); - cit = as_const(c).nth(sz_div_2); - csz = as_const(c).index_of(cit); + cit = (as_const)(c).nth(sz_div_2); + csz = (as_const)(c).index_of(cit); if(it != (c.begin()+sz_div_2)) return false; @@ -63,8 +63,8 @@ bool test_nth_index_of(Container &c) //index size() it = c.nth(c.size()); sz = c.index_of(it); - cit = as_const(c).nth(c.size()); - csz = as_const(c).index_of(cit); + cit = (as_const)(c).nth(c.size()); + csz = (as_const)(c).index_of(cit); if(it != c.end()) return false;