From a10c6d2b143a37590aa7bb47a490a81cab8cc483 Mon Sep 17 00:00:00 2001
From: Lamar Moore <lamar.moore@stfc.ac.uk>
Date: Tue, 13 Mar 2018 12:16:15 +0000
Subject: [PATCH] Fix merge error #21582
---
Framework/Geometry/inc/MantidGeometry/Objects/CSGObject.h | 2 --
Framework/Geometry/inc/MantidGeometry/Objects/IObject.h | 3 ---
Framework/Geometry/src/Objects/CSGObject.cpp | 4 ----
3 files changed, 9 deletions(-)
diff --git a/Framework/Geometry/inc/MantidGeometry/Objects/CSGObject.h b/Framework/Geometry/inc/MantidGeometry/Objects/CSGObject.h
index 3fa15438e5b..26b173e33cc 100644
--- a/Framework/Geometry/inc/MantidGeometry/Objects/CSGObject.h
+++ b/Framework/Geometry/inc/MantidGeometry/Objects/CSGObject.h
@@ -189,8 +189,6 @@ public:
void initDraw() const override;
// Get Geometry Handler
boost::shared_ptr<GeometryHandler> getGeometryHandler() const override;
- virtual boost::shared_ptr<const GeometryHandler>
- getGeometryHandler() const override;
/// Set Geometry Handler
void setGeometryHandler(boost::shared_ptr<GeometryHandler> h);
diff --git a/Framework/Geometry/inc/MantidGeometry/Objects/IObject.h b/Framework/Geometry/inc/MantidGeometry/Objects/IObject.h
index 44358524c39..92f4c32efe2 100644
--- a/Framework/Geometry/inc/MantidGeometry/Objects/IObject.h
+++ b/Framework/Geometry/inc/MantidGeometry/Objects/IObject.h
@@ -96,9 +96,6 @@ public:
virtual void GetObjectGeom(detail::ShapeInfo::GeometryShape &type,
std::vector<Kernel::V3D> &vectors,
double &myradius, double &myheight) const = 0;
- virtual boost::shared_ptr<const GeometryHandler>
- getGeometryHandler() const = 0;
-
// Rendering
virtual void draw() const = 0;
virtual void initDraw() const = 0;
diff --git a/Framework/Geometry/src/Objects/CSGObject.cpp b/Framework/Geometry/src/Objects/CSGObject.cpp
index 3e751683e89..ee88d010606 100644
--- a/Framework/Geometry/src/Objects/CSGObject.cpp
+++ b/Framework/Geometry/src/Objects/CSGObject.cpp
@@ -2100,10 +2100,6 @@ boost::shared_ptr<GeometryHandler> CSGObject::getGeometryHandler() const {
return m_handler;
}
-boost::shared_ptr<const GeometryHandler> CSGObject::getGeometryHandler() const {
- return m_handler;
-}
-
/**
* Updates the geometry handler if needed
*/
--
GitLab