diff options
Diffstat (limited to 'src/core/common')
| -rw-r--r-- | src/core/common/Logger.hpp | 14 | ||||
| -rw-r--r-- | src/core/common/Variant.hpp | 6 |
2 files changed, 3 insertions, 17 deletions
diff --git a/src/core/common/Logger.hpp b/src/core/common/Logger.hpp index 479160b..433aa31 100644 --- a/src/core/common/Logger.hpp +++ b/src/core/common/Logger.hpp @@ -269,12 +269,6 @@ public: // Default constructor Logger() {} - // No copy - Logger(const Logger &) = delete; - - // No assign - Logger &operator=(const Logger &) = delete; - /** * Logs the given message. The file name is set to the topmost file name on * the file name stack. @@ -601,14 +595,6 @@ protected: SourceContextCallback sourceContextCallback) override; public: - // Default move constructor - LoggerFork(LoggerFork &&l) - : calls(std::move(l.calls)), - messages(std::move(l.messages)), - locations(std::move(l.locations)), - callbacks(std::move(l.callbacks)), - parent(std::move(l.parent)){}; - /** * Commits all collected messages to the parent Logger instance. */ diff --git a/src/core/common/Variant.hpp b/src/core/common/Variant.hpp index fc4faf5..103c0e7 100644 --- a/src/core/common/Variant.hpp +++ b/src/core/common/Variant.hpp @@ -211,7 +211,7 @@ private: * * @param v is the Variant instance that should be copied to this instance. */ - void move(Variant &&v) + void move(Variant &&v) noexcept { destroy(); type = v.type; @@ -290,7 +290,7 @@ public: * @param v is the reference to the Variant instance that should be moved, * this instance is invalidated afterwards. */ - Variant(Variant &&v) : ptrVal(nullptr) { move(std::move(v)); } + Variant(Variant &&v) noexcept : ptrVal(nullptr) { move(std::move(v)); } /** * Default constructor. VariantType is set to VariantType:NULLPTR. @@ -413,7 +413,7 @@ public: /** * Move assignment operator. */ - Variant &operator=(Variant &&v) + Variant &operator=(Variant &&v) noexcept { move(std::move(v)); return *this; |