Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/phoenix/function/adapt_callable.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
author | Chris Cannam |
---|---|
date | Mon, 07 Sep 2015 11:12:49 +0100 |
parents | 2665513ce2d3 |
children |
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/phoenix/function/adapt_callable.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/phoenix/function/adapt_callable.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -13,8 +13,9 @@ #include <boost/preprocessor/repetition/repeat.hpp> #define BOOST_PHOENIX_ADAPT_CALLABLE_NULLARY(NAME, FUNC) \ + inline \ boost::phoenix::detail::expression::function_eval<FUNC>::type const \ - inline NAME() \ + NAME() \ { \ return boost::phoenix::detail::expression:: \ function_eval<FUNC>::make(FUNC()); \ @@ -24,11 +25,12 @@ #define BOOST_PHOENIX_ADAPT_CALLABLE(NAME, FUNC, N) \ template <BOOST_PHOENIX_typename_A(N)> \ + inline \ typename \ boost::phoenix::detail::expression::function_eval< \ FUNC \ , BOOST_PHOENIX_A(N)>::type const \ - inline NAME(BOOST_PHOENIX_A_const_ref_a(N)) \ + NAME(BOOST_PHOENIX_A_const_ref_a(N)) \ { \ return boost::phoenix::detail::expression:: \ function_eval<FUNC, BOOST_PHOENIX_A(N)>:: \