From 1313b562bdee9adc07c9a131148b6d1229b153f2 Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Sun, 15 Mar 2020 14:29:18 -0500
Subject: [PATCH] [ox] Remove bstring.hpp include from string.hpp

---
 deps/ox/src/ox/model/desctypes.hpp | 2 +-
 deps/ox/src/ox/model/descwrite.hpp | 2 +-
 deps/ox/src/ox/model/types.hpp     | 2 +-
 deps/ox/src/ox/std/hashmap.hpp     | 2 +-
 deps/ox/src/ox/std/std.hpp         | 1 +
 deps/ox/src/ox/std/string.hpp      | 1 -
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/deps/ox/src/ox/model/desctypes.hpp b/deps/ox/src/ox/model/desctypes.hpp
index 0432f944..83f24020 100644
--- a/deps/ox/src/ox/model/desctypes.hpp
+++ b/deps/ox/src/ox/model/desctypes.hpp
@@ -10,7 +10,7 @@
 
 #include <ox/std/error.hpp>
 #include <ox/std/hashmap.hpp>
-#include <ox/std/string.hpp>
+#include <ox/std/bstring.hpp>
 #include <ox/std/vector.hpp>
 
 namespace ox {
diff --git a/deps/ox/src/ox/model/descwrite.hpp b/deps/ox/src/ox/model/descwrite.hpp
index a1cb3577..75f67268 100644
--- a/deps/ox/src/ox/model/descwrite.hpp
+++ b/deps/ox/src/ox/model/descwrite.hpp
@@ -10,7 +10,7 @@
 
 #include <ox/std/byteswap.hpp>
 #include <ox/std/hashmap.hpp>
-#include <ox/std/string.hpp>
+#include <ox/std/bstring.hpp>
 #include <ox/std/trace.hpp>
 #include <ox/std/types.hpp>
 #include <ox/std/vector.hpp>
diff --git a/deps/ox/src/ox/model/types.hpp b/deps/ox/src/ox/model/types.hpp
index 8d131a06..3cf52db4 100644
--- a/deps/ox/src/ox/model/types.hpp
+++ b/deps/ox/src/ox/model/types.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <ox/std/string.hpp>
+#include <ox/std/bstring.hpp>
 #include <ox/std/strops.hpp>
 #include <ox/std/types.hpp>
 
diff --git a/deps/ox/src/ox/std/hashmap.hpp b/deps/ox/src/ox/std/hashmap.hpp
index 76e85f59..97c35a19 100644
--- a/deps/ox/src/ox/std/hashmap.hpp
+++ b/deps/ox/src/ox/std/hashmap.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "string.hpp"
+#include "strops.hpp"
 #include "vector.hpp"
 
 namespace ox {
diff --git a/deps/ox/src/ox/std/std.hpp b/deps/ox/src/ox/std/std.hpp
index c19dbc19..dfc49797 100644
--- a/deps/ox/src/ox/std/std.hpp
+++ b/deps/ox/src/ox/std/std.hpp
@@ -10,6 +10,7 @@
 
 #include "assert.hpp"
 #include "bit.hpp"
+#include "bstring.hpp"
 #include "byteswap.hpp"
 #include "error.hpp"
 #include "hardware.hpp"
diff --git a/deps/ox/src/ox/std/string.hpp b/deps/ox/src/ox/std/string.hpp
index 43f791d0..3a319949 100644
--- a/deps/ox/src/ox/std/string.hpp
+++ b/deps/ox/src/ox/std/string.hpp
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "bstring.hpp"
 #include "memops.hpp"
 #include "strops.hpp"
 #include "typetraits.hpp"