Refs #4472. Resolving conflicts.

mantidproject · Feb 3, 2012 · 50c39b9 · 50c39b9
1 parent 05e3696
commit 50c39b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IMDWorkspace.h b/Code/Mantid/Framework/API/inc/MantidAPI/IMDWorkspace.h
@@ -103,8 +103,6 @@ namespace Mantid
       /// Method to generate a line plot through a MD-workspace
       virtual void getLinePlot(const Mantid::Kernel::VMD & start, const Mantid::Kernel::VMD & end,
           Mantid::API::MDNormalization normalize, std::vector<coord_t> & x, std::vector<signal_t> & y, std::vector<signal_t> & e) const = 0;
-
-      virtual ~IMDWorkspace();
     };
 
     /// Shared pointer to the IMDWorkspace base class

diff --git a/Code/Mantid/Framework/API/src/MDGeometry.cpp b/Code/Mantid/Framework/API/src/MDGeometry.cpp
@@ -29,8 +29,8 @@ namespace API
   /** Copy Constructor
    */
   MDGeometry::MDGeometry(const MDGeometry & other) :
-   m_originalWorkspace(other.m_originalWorkspace),
-   m_transformFromOriginal(NULL), m_transformToOriginal(NULL),
+   m_originalWorkspaces(other.m_originalWorkspaces),
+   m_transforms_FromOriginal(NULL), m_transforms_ToOriginal(NULL),
    m_delete_observer(*this, &MDGeometry::deleteNotificationReceived),
    m_observingDelete(false)
   {