From c86d2b44ccb7c4c95519f13bc815d03463484cfc Mon Sep 17 00:00:00 2001
From: Michael Wedel <michael.wedel@psi.ch>
Date: Thu, 26 Mar 2015 20:31:38 +0100
Subject: [PATCH] Refs #11432. Reverting change that breaks compilation on
RHEL6
---
.../mantid/geometry/src/Exports/SpaceGroup.cpp | 1 +
.../mantid/geometry/src/Exports/SpaceGroupFactory.cpp | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroup.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroup.cpp
index cf43e745bbb..a6b6e747bd9 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroup.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroup.cpp
@@ -47,6 +47,7 @@ namespace //<unnamed>
void export_SpaceGroup()
{
+ register_ptr_to_python<boost::shared_ptr<SpaceGroup> >();
register_ptr_to_python<boost::shared_ptr<const SpaceGroup> >();
class_<SpaceGroup, boost::noncopyable, bases<Group> >("SpaceGroup", no_init)
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroupFactory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroupFactory.cpp
index 004771bb1fb..0f906422a0f 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroupFactory.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroupFactory.cpp
@@ -30,9 +30,10 @@ namespace
return self.isSubscribed(number);
}
- SpaceGroup_const_sptr createSpaceGroup(SpaceGroupFactoryImpl &self, const std::string &symbol)
+ SpaceGroup_sptr createSpaceGroup(SpaceGroupFactoryImpl &self, const std::string &symbol)
{
- return self.createSpaceGroup(symbol);
+ SpaceGroup_const_sptr spaceGroup = self.createSpaceGroup(symbol);
+ return boost::const_pointer_cast<SpaceGroup>(spaceGroup);
}
}
--
GitLab