From d4bf5fdecb91a576e27a159a25b2521988f3d490 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 7 May 2020 19:02:35 -0700 Subject: [PATCH] [clang-tidy] replace long long with uint64_t Found with google-runtime-int Signed-off-by: Rosen Penev --- include/fmt/os.h | 2 +- src/os.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/fmt/os.h b/include/fmt/os.h index 51a79b14..8023afba 100644 --- a/include/fmt/os.h +++ b/include/fmt/os.h @@ -310,7 +310,7 @@ class file { // Returns the file size. The size has signed type for consistency with // stat::st_size. - FMT_API long long size() const; + FMT_API int64_t size() const; // Attempts to read count bytes from the file into the specified buffer. FMT_API size_t read(void* buffer, size_t count) const; diff --git a/src/os.cc b/src/os.cc index c089fe36..35784d23 100644 --- a/src/os.cc +++ b/src/os.cc @@ -201,7 +201,7 @@ void file::close() { if (result != 0) FMT_THROW(system_error(errno, "cannot close file")); } -auto file::size() const -> long long { +auto file::size() const -> int64_t { # ifdef _WIN32 // Use GetFileSize instead of GetFileSizeEx for the case when _WIN32_WINNT // is less than 0x0500 as is the case with some default MinGW builds. @@ -214,14 +214,14 @@ auto file::size() const -> long long { if (error != NO_ERROR) FMT_THROW(windows_error(GetLastError(), "cannot get file size")); } - unsigned long long long_size = size_upper; + uint64_t long_size = size_upper; return (long_size << sizeof(DWORD) * CHAR_BIT) | size_lower; # else using Stat = struct stat; Stat file_stat = Stat(); if (FMT_POSIX_CALL(fstat(fd_, &file_stat)) == -1) FMT_THROW(system_error(errno, "cannot get file attributes")); - static_assert(sizeof(long long) >= sizeof(file_stat.st_size), + static_assert(sizeof(int64_t) >= sizeof(file_stat.st_size), "return type of file::size is not large enough"); return file_stat.st_size; # endif