From 9b218d4d12f05bad52ff6bc359dd20b08cccea53 Mon Sep 17 00:00:00 2001 From: Guo Xiao Date: Sun, 9 Oct 2016 15:32:02 +0800 Subject: [PATCH 1/2] Convert off_t to size_t --- include/spdlog/details/os.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/spdlog/details/os.h b/include/spdlog/details/os.h index 6d27bc39..86efa0dc 100644 --- a/include/spdlog/details/os.h +++ b/include/spdlog/details/os.h @@ -216,11 +216,11 @@ inline size_t filesize(FILE *f) #if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__)) struct stat64 st; if (fstat64(fd, &st) == 0) - return st.st_size; + return static_cast(st.st_size); #else // unix 32 bits or osx struct stat st; if (fstat(fd, &st) == 0) - return st.st_size; + return static_cast(st.st_size); #endif #endif throw spdlog_ex("Failed getting file size from fd", errno); From 73e53c7cb67bde1402e53e461127d895d76bb05e Mon Sep 17 00:00:00 2001 From: Guo Xiao Date: Sun, 9 Oct 2016 15:34:44 +0800 Subject: [PATCH 2/2] Remove extra ';' --- include/spdlog/details/async_log_helper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/spdlog/details/async_log_helper.h b/include/spdlog/details/async_log_helper.h index 7e9b3eb1..14539e75 100644 --- a/include/spdlog/details/async_log_helper.h +++ b/include/spdlog/details/async_log_helper.h @@ -67,7 +67,7 @@ async_msg(async_msg&& other) SPDLOG_NOEXCEPT: {} async_msg(async_msg_type m_type) :msg_type(m_type) - {}; + {} async_msg& operator=(async_msg&& other) SPDLOG_NOEXCEPT {