From 279c5c8556340e8112c78aa9b7d3d39b9e90236b Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Tue, 15 Aug 2017 18:12:16 -0400 Subject: [PATCH] [Reactor] Make all reactor-related objects noncopyable --- include/cantera/zeroD/FlowDevice.h | 2 ++ include/cantera/zeroD/ReactorBase.h | 2 ++ include/cantera/zeroD/ReactorNet.h | 1 + include/cantera/zeroD/ReactorSurface.h | 3 +++ include/cantera/zeroD/Wall.h | 2 ++ 5 files changed, 10 insertions(+) diff --git a/include/cantera/zeroD/FlowDevice.h b/include/cantera/zeroD/FlowDevice.h index f6ab94bbc..e7848a9c0 100644 --- a/include/cantera/zeroD/FlowDevice.h +++ b/include/cantera/zeroD/FlowDevice.h @@ -32,6 +32,8 @@ public: m_in(0), m_out(0) {} virtual ~FlowDevice() {} + FlowDevice(const FlowDevice&) = delete; + FlowDevice& operator=(const FlowDevice&) = delete; //! Return an integer indicating the type of flow device int type() { diff --git a/include/cantera/zeroD/ReactorBase.h b/include/cantera/zeroD/ReactorBase.h index 854b7f1a9..2592d51dd 100644 --- a/include/cantera/zeroD/ReactorBase.h +++ b/include/cantera/zeroD/ReactorBase.h @@ -46,6 +46,8 @@ class ReactorBase public: explicit ReactorBase(const std::string& name = "(none)"); virtual ~ReactorBase() {} + ReactorBase(const ReactorBase&) = delete; + ReactorBase& operator=(const ReactorBase&) = delete; //! Return a constant indicating the type of this Reactor virtual int type() const { diff --git a/include/cantera/zeroD/ReactorNet.h b/include/cantera/zeroD/ReactorNet.h index e1b686600..8399c5514 100644 --- a/include/cantera/zeroD/ReactorNet.h +++ b/include/cantera/zeroD/ReactorNet.h @@ -26,6 +26,7 @@ public: ReactorNet(); virtual ~ReactorNet() {}; ReactorNet(const ReactorNet&) = delete; + ReactorNet& operator=(const ReactorNet&) = delete; //! @name Methods to set up a simulation. //@{ diff --git a/include/cantera/zeroD/ReactorSurface.h b/include/cantera/zeroD/ReactorSurface.h index 26b9c0fbf..bfaaebf24 100644 --- a/include/cantera/zeroD/ReactorSurface.h +++ b/include/cantera/zeroD/ReactorSurface.h @@ -18,6 +18,9 @@ class ReactorSurface { public: ReactorSurface(); + virtual ~ReactorSurface() {} + ReactorSurface(const ReactorSurface&) = delete; + ReactorSurface& operator=(const ReactorSurface&) = delete; //! Returns the surface area [m^2] double area() const; diff --git a/include/cantera/zeroD/Wall.h b/include/cantera/zeroD/Wall.h index 85a7b2bbe..2469453fe 100644 --- a/include/cantera/zeroD/Wall.h +++ b/include/cantera/zeroD/Wall.h @@ -28,6 +28,8 @@ public: Wall(); virtual ~Wall() {} + Wall(const Wall&) = delete; + Wall& operator=(const Wall&) = delete; //! Rate of volume change (m^3/s) for the adjacent reactors. /*!