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
828a604e
Commit
828a604e
authored
9 years ago
by
Michael Wedel
Browse files
Options
Downloads
Patches
Plain Diff
Refs #14121. Fixing CrystalSystemMap on RHEL6.
parent
3b7267c6
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/PointGroup.h
+12
-4
12 additions, 4 deletions
Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h
Framework/Geometry/src/Crystal/PointGroup.cpp
+5
-0
5 additions, 0 deletions
Framework/Geometry/src/Crystal/PointGroup.cpp
with
17 additions
and
4 deletions
Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h
+
12
−
4
View file @
828a604e
...
@@ -85,10 +85,6 @@ typedef boost::shared_ptr<PointGroup> PointGroup_sptr;
...
@@ -85,10 +85,6 @@ typedef boost::shared_ptr<PointGroup> PointGroup_sptr;
MANTID_GEOMETRY_DLL
std
::
vector
<
PointGroup_sptr
>
getAllPointGroups
();
MANTID_GEOMETRY_DLL
std
::
vector
<
PointGroup_sptr
>
getAllPointGroups
();
typedef
std
::
multimap
<
PointGroup
::
CrystalSystem
,
PointGroup_sptr
>
PointGroupCrystalSystemMap
;
MANTID_GEOMETRY_DLL
PointGroupCrystalSystemMap
getPointGroupsByCrystalSystem
();
MANTID_GEOMETRY_DLL
MANTID_GEOMETRY_DLL
std
::
string
std
::
string
getCrystalSystemAsString
(
const
PointGroup
::
CrystalSystem
&
crystalSystem
);
getCrystalSystemAsString
(
const
PointGroup
::
CrystalSystem
&
crystalSystem
);
...
@@ -105,6 +101,18 @@ MANTID_GEOMETRY_DLL
...
@@ -105,6 +101,18 @@ MANTID_GEOMETRY_DLL
PointGroup
::
LatticeSystem
PointGroup
::
LatticeSystem
getLatticeSystemFromString
(
const
std
::
string
&
latticeSystem
);
getLatticeSystemFromString
(
const
std
::
string
&
latticeSystem
);
/// This is necessary to make the map work with older compilers. Can be removed
/// when GCC 4.4 is not used anymore.
struct
MANTID_GEOMETRY_DLL
CrystalSystemComparator
{
bool
operator
()(
const
PointGroup
::
CrystalSystem
&
lhs
,
const
PointGroup
::
CrystalSystem
&
rhs
);
};
typedef
std
::
multimap
<
PointGroup
::
CrystalSystem
,
PointGroup_sptr
,
CrystalSystemComparator
>
PointGroupCrystalSystemMap
;
MANTID_GEOMETRY_DLL
PointGroupCrystalSystemMap
getPointGroupsByCrystalSystem
();
}
// namespace Mantid
}
// namespace Mantid
}
// namespace Geometry
}
// namespace Geometry
...
...
This diff is collapsed.
Click to expand it.
Framework/Geometry/src/Crystal/PointGroup.cpp
+
5
−
0
View file @
828a604e
...
@@ -327,5 +327,10 @@ getLatticeSystemFromString(const std::string &latticeSystem) {
...
@@ -327,5 +327,10 @@ getLatticeSystemFromString(const std::string &latticeSystem) {
}
}
}
}
bool
CrystalSystemComparator
::
operator
()(
const
PointGroup
::
CrystalSystem
&
lhs
,
const
PointGroup
::
CrystalSystem
&
rhs
)
{
return
static_cast
<
int
>
(
lhs
)
<
static_cast
<
int
>
(
rhs
);
}
}
// namespace Mantid
}
// namespace Mantid
}
// namespace Geometry
}
// namespace Geometry
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