diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2007-09-03 17:48:31 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2007-09-03 17:48:31 +0000 |
| commit | d46c958bfa0f730f479c317c0a0403a93ef99923 (patch) | |
| tree | 0d20d56759c6b61fb4c26a0c9926264a84f32f1e | |
| parent | 96a3900df6837b6f29a3e6b43c5e1c0227fcea00 (diff) | |
| download | gcc-d46c958bfa0f730f479c317c0a0403a93ef99923.zip gcc-d46c958bfa0f730f479c317c0a0403a93ef99923.tar.gz gcc-d46c958bfa0f730f479c317c0a0403a93ef99923.tar.bz2 | |
re PR libstdc++/33293 (inlining std::inner_product())
2007-09-03 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/33293
* include/bits/stl_numeric.h (accumulate, inner_product):
Add inline function-specifier.
From-SVN: r128053
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | 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 55f64a7..3f1734d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2007-09-03 Paolo Carlini <pcarlini@suse.de> + + PR libstdc++/33293 + * include/bits/stl_numeric.h (accumulate, inner_product): + Add inline function-specifier. + 2007-08-31 Douglas Gregor <doug.gregor@gmail.com> * 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 2c44b18..8e5c69b 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<typename _InputIterator, typename _Tp> - _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<typename _InputIterator, typename _Tp, typename _BinaryOperation> - _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<typename _InputIterator1, typename _InputIterator2, typename _Tp> - _Tp + inline _Tp inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _Tp __init) { @@ -165,7 +165,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) */ template<typename _InputIterator1, typename _InputIterator2, typename _Tp, typename _BinaryOperation1, typename _BinaryOperation2> - _Tp + inline _Tp inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _Tp __init, _BinaryOperation1 __binary_op1, |