diff options
Diffstat (limited to 'boost/hana/eval_if.hpp')
-rw-r--r-- | boost/hana/eval_if.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/boost/hana/eval_if.hpp b/boost/hana/eval_if.hpp index e98d987447..7d0be870d3 100644 --- a/boost/hana/eval_if.hpp +++ b/boost/hana/eval_if.hpp @@ -2,7 +2,7 @@ @file Defines `boost::hana::eval_if`. -@copyright Louis Dionne 2013-2016 +@copyright Louis Dionne 2013-2017 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) */ @@ -26,7 +26,7 @@ Distributed under the Boost Software License, Version 1.0. BOOST_HANA_NAMESPACE_BEGIN //! @cond template <typename Cond, typename Then, typename Else> - constexpr decltype(auto) eval_if_t::operator()(Cond&& cond, Then&& then, Else&& else_) const { + constexpr decltype(auto) eval_if_t::operator()(Cond&& cond, Then&& then_, Else&& else_) const { using Bool = typename hana::tag_of<Cond>::type; using EvalIf = BOOST_HANA_DISPATCH_IF(eval_if_impl<Bool>, hana::Logical<Bool>::value @@ -38,7 +38,7 @@ BOOST_HANA_NAMESPACE_BEGIN #endif return EvalIf::apply(static_cast<Cond&&>(cond), - static_cast<Then&&>(then), + static_cast<Then&&>(then_), static_cast<Else&&>(else_)); } //! @endcond @@ -83,7 +83,7 @@ BOOST_HANA_NAMESPACE_BEGIN static constexpr decltype(auto) apply(Cond const&, Then&& t, Else&& e) { constexpr auto cond = hana::value<Cond>(); constexpr bool truth_value = hana::if_(cond, true, false); - return eval_if_helper(hana::bool_c<truth_value>, + return eval_if_helper(hana::bool_<truth_value>{}, static_cast<Then&&>(t), static_cast<Else&&>(e)); } |