Merge commit 'f92c8ab577b28e108464f9b04eaa529fe0add452'

2017-05-12 00:26:58 -05:00
parent c548d200b6 f92c8ab577
commit 89a6196b04
17 changed files with 321 additions and 187 deletions
--- a/deps/ox/src/ox/std/byteswap.hpp
+++ b/deps/ox/src/ox/std/byteswap.hpp
@@ -11,8 +11,6 @@
 #include "types.hpp"

 namespace ox {
-namespace std {
-

 inline int16_t byteSwap(int16_t i) {
 	return (i << 8) | (i >> 8);
@@ -140,6 +138,4 @@ inline uint64_t bigEndianAdapt(uint64_t i) {
 #endif
 }

-
-}
 }
--- a/deps/ox/src/ox/std/test/byteswap_test.cpp
+++ b/deps/ox/src/ox/std/test/byteswap_test.cpp
@@ -10,7 +10,7 @@
 #include <ox/std/std.hpp>

 using namespace std;
-using namespace ox::std;
+using namespace ox;

 template<typename T>
 int testBigEndianAdapt(string str) {