Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename variables to not hide function

Browse Source
This commit is contained in:
Max Lyon
2019-11-29 09:52:53 +01:00
parent 5149aba8cd
commit 0572ae5662
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/OpenMesh/Core/Mesh/SmartRange.hh
View File

@@ -84,12 +84,12 @@ struct SmartRangeT
auto begin = range->begin(); auto begin = range->begin();
auto end = range->end(); auto end = range->end();
assert(begin != end); assert(begin != end);
typename std::decay<decltype (f(*begin))>::type sum = f(*begin); typename std::decay<decltype (f(*begin))>::type result = f(*begin);
auto it = begin; auto it = begin;
++it; ++it;
for (; it != end; ++it) for (; it != end; ++it)
sum += f(*it); result += f(*it);
return sum; return result;
} }
/** @brief Computes the average of elements. /** @brief Computes the average of elements.
@@ -105,16 +105,16 @@ struct SmartRangeT
auto begin = range->begin(); auto begin = range->begin();
auto end = range->end(); auto end = range->end();
assert(begin != end); assert(begin != end);
typename std::decay<decltype (f(*begin))>::type sum = f(*begin); typename std::decay<decltype (f(*begin))>::type result = f(*begin);
auto it = begin; auto it = begin;
++it; ++it;
int n_elements = 1; int n_elements = 1;
for (; it != end; ++it) for (; it != end; ++it)
{ {
sum += f(*it); result += f(*it);
++n_elements; ++n_elements;
} }
return (1.0 / n_elements) * sum; return (1.0 / n_elements) * result;
} }
/** @brief Check if any element fulfils condition. /** @brief Check if any element fulfils condition.