Skip to content
Snippets Groups Projects
Commit dba1cd4b authored by Simon Heybrock's avatar Simon Heybrock
Browse files

Re #12917 Undid previous changes that rely on C++11's "= delete".

parent 3a961e50
No related branches found
No related tags found
No related merge requests found
...@@ -133,8 +133,8 @@ public: ...@@ -133,8 +133,8 @@ public:
virtual MDNormalization displayNormalization() const; virtual MDNormalization displayNormalization() const;
protected: protected:
IMDWorkspace(const IMDWorkspace &other) = default; IMDWorkspace(const IMDWorkspace &other);
IMDWorkspace &operator=(const IMDWorkspace &other) = default; IMDWorkspace &operator=(const IMDWorkspace &other);
virtual const std::string toString() const; virtual const std::string toString() const;
}; };
......
...@@ -84,8 +84,8 @@ public: ...@@ -84,8 +84,8 @@ public:
const WorkspaceHistory &getHistory() const { return m_history; } const WorkspaceHistory &getHistory() const { return m_history; }
protected: protected:
Workspace(const Workspace &other) = default; Workspace(const Workspace &other);
Workspace &operator=(const Workspace &other) = default; Workspace &operator=(const Workspace &other);
private: private:
void setName(const std::string &); void setName(const std::string &);
......
...@@ -13,6 +13,11 @@ namespace API { ...@@ -13,6 +13,11 @@ namespace API {
/** Default constructor */ /** Default constructor */
IMDWorkspace::IMDWorkspace() : Workspace(), Mantid::API::MDGeometry() {} IMDWorkspace::IMDWorkspace() : Workspace(), Mantid::API::MDGeometry() {}
//-----------------------------------------------------------------------------------------------
/** Copy constructor */
IMDWorkspace::IMDWorkspace(const IMDWorkspace &other)
: Workspace(other), Mantid::API::MDGeometry(other) {}
/// Destructor /// Destructor
IMDWorkspace::~IMDWorkspace() {} IMDWorkspace::~IMDWorkspace() {}
......
...@@ -11,6 +11,13 @@ namespace API { ...@@ -11,6 +11,13 @@ namespace API {
Workspace::Workspace() Workspace::Workspace()
: DataItem(), m_title(), m_comment(), m_name(), m_history() {} : DataItem(), m_title(), m_comment(), m_name(), m_history() {}
/** Copy constructor
* @param other :: workspace to copy
*/
Workspace::Workspace(const Workspace &other)
: DataItem(other), m_title(other.m_title), m_comment(other.m_comment),
m_name(other.m_name), m_history(other.m_history) {}
/// Workspace destructor /// Workspace destructor
Workspace::~Workspace() {} Workspace::~Workspace() {}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment