Skip to content
Snippets Groups Projects
Commit 5f18bd6c authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

return result, elsewhere in code base

parent 7ed07c73
No related branches found
No related tags found
1 merge request!1071minor edits
......@@ -65,31 +65,31 @@ public:
{
if (m_v.empty())
return nullptr;
T* ret = back();
T* result = back();
m_v.pop_back();
return ret;
return result;
}
T* release_front()
{
if (m_v.empty())
return nullptr;
T* ret = m_v.front();
T* result = m_v.front();
m_v.erase(m_v.begin());
return ret;
return result;
}
std::vector<const T*> const_vector() const
{
const std::vector<const T*> ret(m_v.begin(), m_v.end());
return ret;
const std::vector<const T*> result(m_v.begin(), m_v.end());
return result;
}
std::vector<T*> cloned_vector() const
{
std::vector<T*> ret;
std::vector<T*> result;
for (T* e : m_v)
ret.emplace_back(e->clone());
return ret;
result.emplace_back(e->clone());
return result;
}
using Iterator = typename std::vector<T*>::iterator; // "typename" can be dropped under C++20
......
......@@ -151,10 +151,10 @@ bool Datafield::hasSameShape(const Datafield& other) const
std::vector<double> Datafield::flatVector() const
{
std::vector<double> ret(size());
std::vector<double> result(size());
for (size_t i = 0; i < size(); ++i)
ret[i] = (*this)[i];
return ret;
result[i] = (*this)[i];
return result;
}
Datafield* Datafield::normalizedToMaximum() const
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment