Fix several warnings and build issues.

This commit is contained in:
2016-12-14 22:25:43 -06:00
parent c66533fc70
commit af55d2db77
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -206,7 +206,7 @@ int FileSystemTemplate<FileStore>::write(uint64_t inode, void *buffer, uint64_t
#endif
template<typename FileStore>
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);
if (buffer && useDirectories) {
+1 -1
View File
@@ -70,7 +70,7 @@ uint64_t bytes(const char *str) {
}
}
const auto retval = ((uint64_t) ::ox_atoi(copy)) * multiplier;
delete copy;
delete []copy;
return retval;
}
+2 -2
View File
@@ -7,14 +7,14 @@
*/
#pragma once
typedef char int8_t;
typedef signed char int8_t;
typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short uint16_t;
typedef int int32_t;
typedef unsigned int uint32_t;
typedef unsigned uint_t;
typedef long long int64_t;
typedef long int64_t;
typedef unsigned long long uint64_t;
namespace ox {