Squashed 'deps/ox/' changes from a5166e0..68c144f
68c144f Add ls to file system 1ce2797 Flatten out namespaces to only ox e0063a7 Cleanup oxfstool format output a2dfb41 Fix FS read by type to read byte by byte git-subtree-dir: deps/ox git-subtree-split: 68c144fe755e1f1a6cebb841b6c37b618a35fa43
This commit is contained in:
		@@ -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
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -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) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user