feedc0de/boost_range
1
0
Fork 0
forked from boostorg/range
Code Pull Requests Activity

Fix msvc-10.0, msvc-11.0 failures in ref_unwrapped tests

Browse Source
This commit is contained in:
Peter Dimov
2018-09-24 02:21:55 +03:00
parent 357bf3b980
commit 7efe3c68f6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/range/adaptor/ref_unwrapped.hpp
View File

@ -32,7 +32,7 @@ namespace boost
typedef BOOST_DEDUCED_TYPENAME typedef BOOST_DEDUCED_TYPENAME
range_reference<SinglePassRange>::type argument_type; range_reference<SinglePassRange>::type argument_type;
using result_type = decltype(std::declval<argument_type>().get() ); typedef decltype(std::declval<argument_type>().get() ) result_type;
result_type operator()( argument_type &&r ) const result_type operator()( argument_type &&r ) const
{ {
@ -46,11 +46,11 @@ namespace boost
: public transformed_range<unwrap_ref<SinglePassRange>, : public transformed_range<unwrap_ref<SinglePassRange>,
SinglePassRange> SinglePassRange>
{ {
using base = transformed_range<unwrap_ref<SinglePassRange>, typedef transformed_range<unwrap_ref<SinglePassRange>,
SinglePassRange>; SinglePassRange> base;
public: public:
using transform_fn_type = unwrap_ref<SinglePassRange>; typedef unwrap_ref<SinglePassRange> transform_fn_type;
using source_range_type = SinglePassRange; typedef SinglePassRange source_range_type;
unwrap_ref_range(transform_fn_type fn, source_range_type &rng) unwrap_ref_range(transform_fn_type fn, source_range_type &rng)
: base(fn, rng) : base(fn, rng)

2
test/adaptor_test/ref_unwrapped.cpp
View File

@ -17,7 +17,7 @@
#include <vector> #include <vector>
#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 namespace boost
{ {