drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Merge branch 'master' of github.com:wombatant/ox

Browse Source
This commit is contained in:
Gary Talent
2016-12-14 22:44:15 -06:00
parent b40faa70f3 cf802c7b99
commit 414580fa7b
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ox/fs/filesystem.hpp
+1 -1
View File
@@ -206,7 +206,7 @@ int FileSystemTemplate<FileStore>::write(uint64_t inode, void *buffer, uint64_t
#endif #endif
template<typename FileStore> template<typename FileStore>
uint8_t *FileSystemTemplate<FileStore>::format(void *buffer, typename FileStore::FsSize_t size, bool useDirectories) { uint8_t *FileSystemTemplate<FileStore>::format(void *buffer, typename FileStore::FsSize_t size, bool useDirectories) {
buffer = FileStore::format((uint8_t*) buffer, size, FS_TYPE); buffer = FileStore::format((uint8_t*) buffer, size, (uint32_t) FileSystemTemplate<FileStore>::FS_TYPE);
auto fs = createFileSystem(buffer); auto fs = createFileSystem(buffer);
if (buffer && useDirectories) { if (buffer && useDirectories) {
src/ox/fs/oxfstool.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ size_t bytes(const char *str) {
} }
} }
const auto retval = ((size_t) ox_atoi(copy)) * multiplier; const auto retval = ((size_t) ox_atoi(copy)) * multiplier;
delete copy; delete []copy;
return retval; return retval;
} }
src/ox/std/types.hpp
+1 -1
View File
@@ -14,7 +14,7 @@ typedef unsigned short uint16_t;
typedef int int32_t; typedef int int32_t;
typedef unsigned int uint32_t; typedef unsigned int uint32_t;
typedef unsigned uint_t; typedef unsigned uint_t;
typedef long long int64_t; typedef long int64_t;
typedef unsigned long long uint64_t; typedef unsigned long long uint64_t;
namespace ox { namespace ox {