diff options
Diffstat (limited to 'include/mbgl/util')
-rw-r--r-- | include/mbgl/util/image.hpp | 8 | ||||
-rw-r--r-- | include/mbgl/util/immutable.hpp | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/include/mbgl/util/image.hpp b/include/mbgl/util/image.hpp index 75a49550b1..e0ee694434 100644 --- a/include/mbgl/util/image.hpp +++ b/include/mbgl/util/image.hpp @@ -34,13 +34,9 @@ public: Image(Size size_, std::unique_ptr<uint8_t[]> data_) : size(size_), data(std::move(data_)) {} - Image(Image&& o) - : size(o.size), - data(std::move(o.data)) { - o.size.width = o.size.height = 0; - } + Image(Image&& o) noexcept : size(o.size), data(std::move(o.data)) { o.size.width = o.size.height = 0; } - Image& operator=(Image&& o) { + Image& operator=(Image&& o) noexcept { size = o.size; data = std::move(o.data); o.size.width = o.size.height = 0; diff --git a/include/mbgl/util/immutable.hpp b/include/mbgl/util/immutable.hpp index bc6a0467ae..fbd3ac9b34 100644 --- a/include/mbgl/util/immutable.hpp +++ b/include/mbgl/util/immutable.hpp @@ -21,8 +21,8 @@ namespace mbgl { template <class T> class Mutable { public: - Mutable(Mutable&&) = default; - Mutable& operator=(Mutable&&) = default; + Mutable(Mutable&&) noexcept = default; + Mutable& operator=(Mutable&&) noexcept = default; Mutable(const Mutable&) = delete; Mutable& operator=(const Mutable&) = delete; @@ -74,7 +74,7 @@ public: Immutable(Immutable<S> s) : ptr(std::move(s.ptr)) {} - Immutable(Immutable&&) = default; + Immutable(Immutable&&) noexcept = default; Immutable(const Immutable&) = default; template <class S> @@ -83,7 +83,7 @@ public: return *this; } - Immutable& operator=(Immutable&&) = default; + Immutable& operator=(Immutable&&) noexcept = default; Immutable& operator=(const Immutable&) = default; const T* get() const { return ptr.get(); } |