External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'silence_warnings'

Browse Source
This commit is contained in:
Carter Li 2015-02-16 09:59:28 +08:00
commit bfa4731b35
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
format.cc
View File

@ -487,6 +487,11 @@ FMT_FUNC int fmt::internal::UTF16ToUTF8::convert(fmt::WStringRef s) {
return 0;
}
# ifdef __GNUC__
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wshadow"
# endif
FMT_FUNC void fmt::WindowsError::init(
int error_code, StringRef format_str, ArgList args) {
error_code_ = error_code;
@ -496,6 +501,10 @@ FMT_FUNC void fmt::WindowsError::init(
base = std::runtime_error(w.str());
}
# ifdef __GNUC__
# pragma GCC diagnostic pop
# endif
#endif
FMT_FUNC void fmt::internal::format_system_error(

10
posix.cc
View File

@ -134,13 +134,13 @@ void fmt::File::close() {
fmt::LongLong fmt::File::size() const {
#ifdef _WIN32
LARGE_INTEGER size = {};
LARGE_INTEGER filesize = {};
HANDLE handle = reinterpret_cast<HANDLE>(_get_osfhandle(fd_));
if (!FMT_SYSTEM(GetFileSizeEx(handle, &size)))
if (!FMT_SYSTEM(GetFileSizeEx(handle, &filesize)))
throw WindowsError(GetLastError(), "cannot get file size");
FMT_STATIC_ASSERT(sizeof(fmt::LongLong) >= sizeof(size.QuadPart),
FMT_STATIC_ASSERT(sizeof(fmt::LongLong) >= sizeof(filesize.QuadPart),
"return type of File::size is not large enough");
return size.QuadPart;
return filesize.QuadPart;
#else
typedef struct stat Stat;
Stat file_stat = Stat();
@ -228,7 +228,7 @@ fmt::BufferedFile fmt::File::fdopen(const char *mode) {
long fmt::getpagesize() {
#ifdef _WIN32
SYSTEM_INFO si = {};
SYSTEM_INFO si;
GetSystemInfo(&si);
return si.dwPageSize;
#else

5
test/util-test.cc
View File

@ -699,9 +699,8 @@ void test_count_digits() {
}
TEST(UtilTest, StringRef) {
char space[100];
std::strcpy(space, "some string");
EXPECT_EQ(sizeof("some string") - 1, StringRef(space).size());
char space[100] = "some string";
EXPECT_EQ(std::strlen(space), StringRef(space).size());
}
TEST(UtilTest, CountDigits) {