From b12097769e29014e3d3ca3b6cadc8f60eaac0fb9 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Tue, 14 Nov 2023 20:23:21 -0600 Subject: [PATCH] [ox/std] Fix MSVC warnings --- deps/ox/src/ox/std/hashmap.hpp | 4 ++-- deps/ox/src/ox/std/memory.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deps/ox/src/ox/std/hashmap.hpp b/deps/ox/src/ox/std/hashmap.hpp index 18332f42..589e49fb 100644 --- a/deps/ox/src/ox/std/hashmap.hpp +++ b/deps/ox/src/ox/std/hashmap.hpp @@ -41,7 +41,7 @@ class HashMap { constexpr HashMap &operator=(const HashMap &other); - constexpr HashMap &operator=(HashMap &&other); + constexpr HashMap &operator=(HashMap &&other) noexcept; /** * K is assumed to be a null terminated string. @@ -135,7 +135,7 @@ constexpr HashMap &HashMap::operator=(const HashMap &other) { } template -constexpr HashMap &HashMap::operator=(HashMap &&other) { +constexpr HashMap &HashMap::operator=(HashMap &&other) noexcept { if (this != &other) { clear(); m_keys = std::move(other.m_keys); diff --git a/deps/ox/src/ox/std/memory.hpp b/deps/ox/src/ox/std/memory.hpp index 58a06929..8457fbd2 100644 --- a/deps/ox/src/ox/std/memory.hpp +++ b/deps/ox/src/ox/std/memory.hpp @@ -222,13 +222,13 @@ class UniquePtr { template constexpr UniquePtr &operator=(const UniquePtr &other) = delete; - constexpr UniquePtr &operator=(UniquePtr &&other) { + constexpr UniquePtr &operator=(UniquePtr &&other) noexcept { reset(std::move(other)); return *this; } template - constexpr UniquePtr &operator=(UniquePtr &&other) { + constexpr UniquePtr &operator=(UniquePtr &&other) noexcept { reset(std::move(other)); return *this; }