From 7ea0654af6293418f486663b9c6c4bedc2b263db Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Fri, 23 Jul 2021 21:29:57 -0500
Subject: [PATCH] [ox/std] Add proper forward function

---
 deps/ox/src/ox/std/memory.hpp     |  2 +-
 deps/ox/src/ox/std/typetraits.hpp |  3 +++
 deps/ox/src/ox/std/utility.hpp    | 19 +++++++++++++++++++
 deps/ox/src/ox/std/vector.hpp     |  3 ++-
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/deps/ox/src/ox/std/memory.hpp b/deps/ox/src/ox/std/memory.hpp
index 8a2158c7..97ed124b 100644
--- a/deps/ox/src/ox/std/memory.hpp
+++ b/deps/ox/src/ox/std/memory.hpp
@@ -116,7 +116,7 @@ constexpr bool operator!=(std::nullptr_t, const UniquePtr<T> &p2) noexcept {
 template<typename T, typename ...Args>
 [[nodiscard]]
 constexpr auto make_unique(Args&&... args) {
-	return UniquePtr(new T(static_cast<Args&&>(args)...));
+	return UniquePtr(new T(forward<Args>(args)...));
 }
 
 }
diff --git a/deps/ox/src/ox/std/typetraits.hpp b/deps/ox/src/ox/std/typetraits.hpp
index 70012e7e..74074012 100644
--- a/deps/ox/src/ox/std/typetraits.hpp
+++ b/deps/ox/src/ox/std/typetraits.hpp
@@ -175,4 +175,7 @@ struct remove_reference<T&&> {
 	using type = T;
 };
 
+template<typename T>
+using remove_reference_t = typename remove_reference<T>::type;
+
 }
diff --git a/deps/ox/src/ox/std/utility.hpp b/deps/ox/src/ox/std/utility.hpp
index d55fce2a..9d76f5b9 100644
--- a/deps/ox/src/ox/std/utility.hpp
+++ b/deps/ox/src/ox/std/utility.hpp
@@ -12,9 +12,28 @@
 
 namespace ox {
 
+template<class T>
+constexpr T &&forward(remove_reference_t<T> &t) noexcept {
+	return static_cast<T&&>(t);
+}
+
+template<class T>
+constexpr T &&forward(remove_reference_t<T> &&t) noexcept {
+	return static_cast<T&&>(t);
+}
+
 template<typename T>
 constexpr typename remove_reference<T>::type &&move(T &&t) noexcept {
 	return static_cast<typename remove_reference<T>::type&&>(t);
 }
 
 }
+
+#if !__has_include(<utility>)
+namespace std {
+template<typename T>
+constexpr typename ox::remove_reference<T>::type &&move(T &&t) noexcept {
+	return static_cast<typename ox::remove_reference<T>::type&&>(t);
+}
+}
+#endif
diff --git a/deps/ox/src/ox/std/vector.hpp b/deps/ox/src/ox/std/vector.hpp
index 592bfa86..60f475c8 100644
--- a/deps/ox/src/ox/std/vector.hpp
+++ b/deps/ox/src/ox/std/vector.hpp
@@ -67,6 +67,7 @@ struct SmallVector<T, 0> {
 			*items = bit_cast<T*>(new AllocAlias<T>[cap]);
 		}
 
+		[[maybe_unused]]
 		constexpr void moveItemsFrom(T**, SmallVector&, const std::size_t, const std::size_t) noexcept {
 		}
 
@@ -488,7 +489,7 @@ void Vector<T, SmallVectorSize>::emplace_back(Args&&... args) {
 	if (m_size == m_cap) {
 		expandCap(m_cap ? m_cap * 2 : 100);
 	}
-	new (&m_items[m_size]) T{static_cast<Args>(args)...};
+	new (&m_items[m_size]) T{forward<Args>(args)...};
 	++m_size;
 }