From c847c85a77dedc45553d297d825f8ce3e4207d3c Mon Sep 17 00:00:00 2001 From: Mathieu Champlon Date: Sun, 15 Jan 2017 12:46:20 +0100 Subject: [PATCH] Fixed mocking of a function returning a reference for gcc 4.1 --- doc/changelog.qbk | 7 +++++++ include/turtle/detail/action.hpp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/changelog.qbk b/doc/changelog.qbk index 86aeb2b..d84a352 100644 --- a/doc/changelog.qbk +++ b/doc/changelog.qbk @@ -7,6 +7,13 @@ [section Changelog] +[section unreleased] +Not yet released + +* Fixed mocking of a function returning a reference for gcc 4.1 + +[endsect] + [section 1.3.0] Released 17 July 2016 diff --git a/include/turtle/detail/action.hpp b/include/turtle/detail/action.hpp index db98aad..92cd75e 100644 --- a/include/turtle/detail/action.hpp +++ b/include/turtle/detail/action.hpp @@ -150,7 +150,7 @@ namespace detail return static_cast< value_imp< T >& >( *v_ ).t_; } template< typename T > - Result& store( T* t ) + typename boost::remove_reference< Result >::type& store( T* t ) { v_.reset( new value_imp< Result >( t ) ); return static_cast< value_imp< Result >& >( *v_ ).t_;