Skip to content
Snippets Groups Projects
Commit 72cfc545 authored by Federico Montesino Pouzols's avatar Federico Montesino Pouzols
Browse files

Merge pull request #14024 from mantidproject/14023_fix_hklgenerator_valgrind_problem

Fix unitialized variables issue with HKLGenerator::const_iterator
parents 864d8feb 521a4355
No related branches found
No related tags found
No related merge requests found
...@@ -113,8 +113,7 @@ public: ...@@ -113,8 +113,7 @@ public:
: public boost::iterator_facade<const_iterator, const Kernel::V3D &, : public boost::iterator_facade<const_iterator, const Kernel::V3D &,
boost::forward_traversal_tag> { boost::forward_traversal_tag> {
public: public:
/// Default constructor, requirement from boost::iterator_facade const_iterator();
const_iterator() {}
explicit const_iterator(const Kernel::V3D &current); explicit const_iterator(const Kernel::V3D &current);
......
...@@ -59,6 +59,11 @@ V3D HKLGenerator::getEndHKL() const { ...@@ -59,6 +59,11 @@ V3D HKLGenerator::getEndHKL() const {
return V3D(m_hklMax.X() + 1, m_hklMin.Y(), m_hklMin.Z()); return V3D(m_hklMax.X() + 1, m_hklMin.Y(), m_hklMin.Z());
} }
/// Default constructor, requirement from boost::iterator_facade
HKLGenerator::const_iterator::const_iterator()
: m_h(0), m_k(0), m_l(0), m_hkl(V3D(0, 0, 0)), m_hMin(0), m_hMax(0),
m_kMin(0), m_kMax(0), m_lMin(0), m_lMax(0) {}
/// Return an iterator with min = max = current. /// Return an iterator with min = max = current.
HKLGenerator::const_iterator::const_iterator(const V3D &current) HKLGenerator::const_iterator::const_iterator(const V3D &current)
: m_h(static_cast<int>(current.X())), m_k(static_cast<int>(current.Y())), : m_h(static_cast<int>(current.X())), m_k(static_cast<int>(current.Y())),
......
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