diff options
author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2014-12-21 14:03:44 +0100 |
---|---|---|
committer | Andreas Stöckel <andreas@somweyr.de> | 2014-12-21 14:03:44 +0100 |
commit | 54d66cfa220128ae6c7cd05aa5db3354e459105b (patch) | |
tree | 9c1023a7927e0451487df1acb70eba26b8326072 /src/core/common | |
parent | b5e0b3822f08ad64d2cdacce15256222759a59e1 (diff) |
Function now derives from Managed
Diffstat (limited to 'src/core/common')
-rw-r--r-- | src/core/common/Function.hpp | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/src/core/common/Function.hpp b/src/core/common/Function.hpp index 3a0ed9f..0274603 100644 --- a/src/core/common/Function.hpp +++ b/src/core/common/Function.hpp @@ -31,6 +31,8 @@ #include <cassert> #include <memory> +#include <core/managed/Managed.hpp> + #include "Variant.hpp" namespace ousia { @@ -41,33 +43,8 @@ namespace ousia { * using the call function in which an array of Variant is supplied to the * function and a Variant is returned to the caller. */ -class AbstractFunction { -private: - /** - * Private, non-callable constructor. - */ - AbstractFunction(){}; - - /* No copy constructor */ - AbstractFunction(const AbstractFunction &) = delete; - - /* No move constructor */ - AbstractFunction(AbstractFunction &&) = delete; - +class AbstractFunction : public Managed { public: - /** - * Pure virtual method used to create a copy of the AbstractFunction - * object. - * - * @return a unique pointer pointing at a copy of the AbstractFunction - * object. - */ - virtual std::unique_ptr<AbstractFunction> clone() const = 0; - - /** - * Virtual destructor. - */ - virtual ~AbstractFunction() {} /** * Abstract function which is meant to call the underlying function (be it |