research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add std:: to "inner_product" and "accumulate"

Browse source 
This only works because the "dot" function is always called with std::vector<T>::iterator as input so that "argument dependent lookup" introduces the std namespace to the function. If the dot function is called like this "dot(v.data(), v.data()+v.size(), v.data())", where "v" is a std::vector and the input are plain pointers, the compiler will not find "inner_product". The same is true for the use of "accumulate".
This commit is contained in:
g3bk47 2018-09-14 03:22:06 +02:00 • committed by Ray Speth
parent b0b66d7211
commit 1166c74127
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/cantera/base/utilities.h
View file

@ -107,7 +107,7 @@ template<class InputIter, class InputIter2>
inline doublereal dot(InputIter x_begin, InputIter x_end,
InputIter2 y_begin)
{
return inner_product(x_begin, x_end, y_begin, 0.0);
return std::inner_product(x_begin, x_end, y_begin, 0.0);
}
//! Multiply elements of an array by a scale factor.
@ -234,7 +234,7 @@ template<class InputIter, class OutputIter>
inline void normalize(InputIter begin, InputIter end,
OutputIter out)
{
doublereal sum = accumulate(begin, end, 0.0);
doublereal sum = std::accumulate(begin, end, 0.0);
for (; begin != end; ++begin, ++out) {
*out = *begin/sum;
}