Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
9dbbc939
Commit
9dbbc939
authored
9 years ago
by
Michael Wedel
Browse files
Options
Downloads
Patches
Plain Diff
Proper default constructor for HKLGenerator::const_iterator
Refs #14023.
parent
f9e5a621
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Framework/Geometry/inc/MantidGeometry/Crystal/HKLGenerator.h
+1
-2
1 addition, 2 deletions
Framework/Geometry/inc/MantidGeometry/Crystal/HKLGenerator.h
Framework/Geometry/src/Crystal/HKLGenerator.cpp
+5
-0
5 additions, 0 deletions
Framework/Geometry/src/Crystal/HKLGenerator.cpp
with
6 additions
and
2 deletions
Framework/Geometry/inc/MantidGeometry/Crystal/HKLGenerator.h
+
1
−
2
View file @
9dbbc939
...
...
@@ -113,8 +113,7 @@ public:
:
public
boost
::
iterator_facade
<
const_iterator
,
const
Kernel
::
V3D
&
,
boost
::
forward_traversal_tag
>
{
public:
/// Default constructor, requirement from boost::iterator_facade
const_iterator
()
{}
const_iterator
();
explicit
const_iterator
(
const
Kernel
::
V3D
&
current
);
...
...
This diff is collapsed.
Click to expand it.
Framework/Geometry/src/Crystal/HKLGenerator.cpp
+
5
−
0
View file @
9dbbc939
...
...
@@ -59,6 +59,11 @@ V3D HKLGenerator::getEndHKL() const {
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
(
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.
HKLGenerator
::
const_iterator
::
const_iterator
(
const
V3D
&
current
)
:
m_h
(
static_cast
<
int
>
(
current
.
X
())),
m_k
(
static_cast
<
int
>
(
current
.
Y
())),
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment