From c178a2273bca5236c9df16085b1be01db3ccd28a Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Fri, 5 Jun 2020 19:47:29 -0500
Subject: [PATCH] [ox/std] Fix macOS build

---
 deps/ox/src/ox/std/heapmgr.cpp    | 2 +-
 deps/ox/src/ox/std/test/tests.cpp | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/deps/ox/src/ox/std/heapmgr.cpp b/deps/ox/src/ox/std/heapmgr.cpp
index a7067f38..15eff4ca 100644
--- a/deps/ox/src/ox/std/heapmgr.cpp
+++ b/deps/ox/src/ox/std/heapmgr.cpp
@@ -35,7 +35,7 @@ T *HeapSegment::data() {
 	return ox::bit_cast<T*>(ox::bit_cast<uint8_t*>(this) + alignedSize(this));
 }
 
-template<typename T = uint8_t>
+template<typename T>
 T *HeapSegment::end() {
 	const auto size = alignedSize(this) + alignedSize(this->size);
 	auto e = ox::bit_cast<uintptr_t>(ox::bit_cast<uint8_t*>(this) + size);
diff --git a/deps/ox/src/ox/std/test/tests.cpp b/deps/ox/src/ox/std/test/tests.cpp
index f693484a..dcedcffe 100644
--- a/deps/ox/src/ox/std/test/tests.cpp
+++ b/deps/ox/src/ox/std/test/tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2018 gtalent2@gmail.com
+ * Copyright 2015 - 2020 gtalent2@gmail.com
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,13 +11,11 @@
 #include <functional>
 #include <ox/std/std.hpp>
 
-using namespace std;
-
-map<string, function<int()>> tests = {
+std::map<std::string, std::function<int()>> tests = {
 	{
 		"malloc",
 		[] {
-			std::vector<char> buff(ox::units::MB);
+			ox::Vector<char> buff(ox::units::MB);
 			ox::heapmgr::initHeap(&buff.front(), &buff.back());
 			oxAssert(ox::heapmgr::malloc(5) != nullptr, "malloc is broken");
 			oxAssert(ox::heapmgr::malloc(5) != nullptr, "malloc is broken");