drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[ox/std] Fix MSVC warnings

Browse Source
This commit is contained in:
Gary Talent 2023-11-14 20:23:21 -06:00
parent 99a7a2cbfc
commit b12097769e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/ox/src/ox/std/hashmap.hpp vendored
View File

@ -41,7 +41,7 @@ class HashMap {
constexpr HashMap &operator=(const HashMap &other); 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. * K is assumed to be a null terminated string.
@ -135,7 +135,7 @@ constexpr HashMap<K, T> &HashMap<K, T>::operator=(const HashMap<K, T> &other) {
} }
template<typename K, typename T> template<typename K, typename T>
constexpr HashMap<K, T> &HashMap<K, T>::operator=(HashMap<K, T> &&other) { constexpr HashMap<K, T> &HashMap<K, T>::operator=(HashMap<K, T> &&other) noexcept {
if (this != &other) { if (this != &other) {
clear(); clear();
m_keys = std::move(other.m_keys); m_keys = std::move(other.m_keys);

4
deps/ox/src/ox/std/memory.hpp vendored
View File

@ -222,13 +222,13 @@ class UniquePtr {
template<typename U> template<typename U>
constexpr UniquePtr &operator=(const UniquePtr<U> &other) = delete; constexpr UniquePtr &operator=(const UniquePtr<U> &other) = delete;
constexpr UniquePtr &operator=(UniquePtr<T> &&other) { constexpr UniquePtr &operator=(UniquePtr<T> &&other) noexcept {
reset(std::move(other)); reset(std::move(other));
return *this; return *this;
} }
template<typename U> template<typename U>
constexpr UniquePtr &operator=(UniquePtr<U> &&other) { constexpr UniquePtr &operator=(UniquePtr<U> &&other) noexcept {
reset(std::move(other)); reset(std::move(other));
return *this; return *this;
} }