From d46c958bfa0f730f479c317c0a0403a93ef99923 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 3 Sep 2007 17:48:31 +0000 Subject: [PATCH] re PR libstdc++/33293 (inlining std::inner_product()) 2007-09-03 Paolo Carlini PR libstdc++/33293 * include/bits/stl_numeric.h (accumulate, inner_product): Add inline function-specifier. From-SVN: r128053 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/stl_numeric.h | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 55f64a7f610..3f1734d0c6b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2007-09-03 Paolo Carlini + + PR libstdc++/33293 + * include/bits/stl_numeric.h (accumulate, inner_product): + Add inline function-specifier. + 2007-08-31 Douglas Gregor * testsuite/abi/demangle/cxx0x/rref.cc: New. diff --git a/libstdc++-v3/include/bits/stl_numeric.h b/libstdc++-v3/include/bits/stl_numeric.h index 2c44b180840..8e5c69b8c04 100644 --- a/libstdc++-v3/include/bits/stl_numeric.h +++ b/libstdc++-v3/include/bits/stl_numeric.h @@ -79,7 +79,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @return The final sum. */ template - _Tp + inline _Tp accumulate(_InputIterator __first, _InputIterator __last, _Tp __init) { // concept requirements @@ -105,7 +105,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @return The final sum. */ template - _Tp + inline _Tp accumulate(_InputIterator __first, _InputIterator __last, _Tp __init, _BinaryOperation __binary_op) { @@ -133,7 +133,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @return The final inner product. */ template - _Tp + inline _Tp inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _Tp __init) { @@ -165,7 +165,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) */ template - _Tp + inline _Tp inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _Tp __init, _BinaryOperation1 __binary_op1,