Fix issues building with MSVC
This commit is contained in:
+5
-5
@@ -6,11 +6,6 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
|
||||
include(address_sanitizer)
|
||||
|
||||
add_definitions(
|
||||
-std=c++11
|
||||
-Wall
|
||||
-nostdlib
|
||||
-fno-exceptions
|
||||
-fno-rtti
|
||||
#-Werror
|
||||
#--analyze
|
||||
#-Os # GCC size optimization flag
|
||||
@@ -18,6 +13,11 @@ add_definitions(
|
||||
|
||||
if(NOT MSVC)
|
||||
add_definitions(
|
||||
-std=c++11
|
||||
-Wall
|
||||
-nostdlib
|
||||
-fno-exceptions
|
||||
-fno-rtti
|
||||
-Wsign-compare
|
||||
)
|
||||
endif(NOT MSVC)
|
||||
|
||||
+2
-2
@@ -25,9 +25,9 @@ typedef unsigned long long uint64_t;
|
||||
|
||||
typedef uint32_t Error;
|
||||
|
||||
#if defined(_LP64) || defined(__ppc64__)
|
||||
#if defined(_LP64) || defined(__ppc64__) || defined(_WIN64)
|
||||
typedef uint64_t size_t;
|
||||
#elif defined(_LP32) || defined(__ppc__)
|
||||
#elif defined(_LP32) || defined(__ppc__) || defined(_WIN32)
|
||||
typedef uint32_t size_t;
|
||||
#else
|
||||
#error size_t undefined
|
||||
|
||||
+2
-2
@@ -122,7 +122,7 @@ class FileStore {
|
||||
* @param pathLen number of characters in pathLen
|
||||
* @return the requested Inode, if available
|
||||
*/
|
||||
Inode *getRecord(FileStore::Inode *root, InodeId_t id);
|
||||
Inode *getRecord(Inode *root, InodeId_t id);
|
||||
|
||||
/**
|
||||
* Gets an address for a new Inode.
|
||||
@@ -263,7 +263,7 @@ typename FileStore<FsSize_t>::FsHeader *FileStore<FsSize_t>::getHeader() {
|
||||
}
|
||||
|
||||
template<typename FsSize_t>
|
||||
typename FileStore<FsSize_t>::Inode *FileStore<FsSize_t>::getRecord(FileStore::Inode *root, InodeId_t id) {
|
||||
typename FileStore<FsSize_t>::Inode *FileStore<FsSize_t>::getRecord(Inode *root, InodeId_t id) {
|
||||
Inode *retval = nullptr;
|
||||
|
||||
if (root->m_id > id) {
|
||||
|
||||
Reference in New Issue
Block a user