diff options
Diffstat (limited to 'boost/gil/extension/dynamic_image/apply_operation_base.hpp')
-rw-r--r-- | boost/gil/extension/dynamic_image/apply_operation_base.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/boost/gil/extension/dynamic_image/apply_operation_base.hpp b/boost/gil/extension/dynamic_image/apply_operation_base.hpp index 3b55de6e03..2204a93b01 100644 --- a/boost/gil/extension/dynamic_image/apply_operation_base.hpp +++ b/boost/gil/extension/dynamic_image/apply_operation_base.hpp @@ -127,13 +127,13 @@ GIL_GENERATE_APPLY_FWD_OPS(99) // unary application template <typename Types, typename Bits, typename Op> -typename Op::result_type GIL_FORCEINLINE apply_operation_basec(const Bits& bits, std::size_t index, Op op) { +typename Op::result_type BOOST_FORCEINLINE apply_operation_basec(const Bits& bits, std::size_t index, Op op) { return detail::apply_operation_fwd_fn<mpl::size<Types>::value>().template applyc<Types>(bits,index,op); } // unary application template <typename Types, typename Bits, typename Op> -typename Op::result_type GIL_FORCEINLINE apply_operation_base( Bits& bits, std::size_t index, Op op) { +typename Op::result_type BOOST_FORCEINLINE apply_operation_base( Bits& bits, std::size_t index, Op op) { return detail::apply_operation_fwd_fn<mpl::size<Types>::value>().template apply<Types>(bits,index,op); } @@ -141,26 +141,26 @@ namespace detail { template <typename T2, typename Op> struct reduce_bind1 { const T2& _t2; - Op& _op; + Op& _op; typedef typename Op::result_type result_type; reduce_bind1(const T2& t2, Op& op) : _t2(t2), _op(op) {} - template <typename T1> GIL_FORCEINLINE result_type operator()(const T1& t1) { return _op(t1, _t2); } + template <typename T1> BOOST_FORCEINLINE result_type operator()(const T1& t1) { return _op(t1, _t2); } }; template <typename Types1, typename Bits1, typename Op> struct reduce_bind2 { const Bits1& _bits1; std::size_t _index1; - Op& _op; + Op& _op; typedef typename Op::result_type result_type; reduce_bind2(const Bits1& bits1, std::size_t index1, Op& op) : _bits1(bits1), _index1(index1), _op(op) {} - template <typename T2> GIL_FORCEINLINE result_type operator()(const T2& t2) { + template <typename T2> BOOST_FORCEINLINE result_type operator()(const T2& t2) { return apply_operation_basec<Types1>(_bits1, _index1, reduce_bind1<T2,Op>(t2, _op)); } }; @@ -168,7 +168,7 @@ namespace detail { // Binary application by applying on each dimension separately template <typename Types1, typename Types2, typename Bits1, typename Bits2, typename Op> -static typename Op::result_type GIL_FORCEINLINE apply_operation_base(const Bits1& bits1, std::size_t index1, const Bits2& bits2, std::size_t index2, Op op) { +static typename Op::result_type BOOST_FORCEINLINE apply_operation_base(const Bits1& bits1, std::size_t index1, const Bits2& bits2, std::size_t index2, Op op) { return apply_operation_basec<Types2>(bits2,index2,detail::reduce_bind2<Types1,Bits1,Op>(bits1,index1,op)); } |