From 7efe3c68f606679f134ee57a060fec3e5e90af79 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Mon, 24 Sep 2018 02:21:55 +0300 Subject: [PATCH] Fix msvc-10.0, msvc-11.0 failures in ref_unwrapped tests --- include/boost/range/adaptor/ref_unwrapped.hpp | 10 +++++----- test/adaptor_test/ref_unwrapped.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/boost/range/adaptor/ref_unwrapped.hpp b/include/boost/range/adaptor/ref_unwrapped.hpp index 71af483..0369cc3 100644 --- a/include/boost/range/adaptor/ref_unwrapped.hpp +++ b/include/boost/range/adaptor/ref_unwrapped.hpp @@ -32,7 +32,7 @@ namespace boost typedef BOOST_DEDUCED_TYPENAME range_reference::type argument_type; - using result_type = decltype(std::declval().get() ); + typedef decltype(std::declval().get() ) result_type; result_type operator()( argument_type &&r ) const { @@ -46,11 +46,11 @@ namespace boost : public transformed_range, SinglePassRange> { - using base = transformed_range, - SinglePassRange>; + typedef transformed_range, + SinglePassRange> base; public: - using transform_fn_type = unwrap_ref; - using source_range_type = SinglePassRange; + typedef unwrap_ref transform_fn_type; + typedef SinglePassRange source_range_type; unwrap_ref_range(transform_fn_type fn, source_range_type &rng) : base(fn, rng) diff --git a/test/adaptor_test/ref_unwrapped.cpp b/test/adaptor_test/ref_unwrapped.cpp index ea190b3..c476b74 100644 --- a/test/adaptor_test/ref_unwrapped.cpp +++ b/test/adaptor_test/ref_unwrapped.cpp @@ -17,7 +17,7 @@ #include -#if !defined(BOOST_NO_CXX11_AUTO_DECLARATIONS) && !defined(BOOST_NO_CXX11_RANGE_BASED_FOR) +#if !defined(BOOST_NO_CXX11_AUTO_DECLARATIONS) && !defined(BOOST_NO_CXX11_RANGE_BASED_FOR) && !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) namespace boost {