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

fix warnings

Browse Source 
fixes:
-Wconversion, -Wsign-conversion, -Wshadow, -Wnon-virtual-dtor
This commit is contained in:
ITotalJustice 2020-08-18 09:16:46 +01:00
parent f9f02df719
commit 8ff5190d35
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/fmt/core.h
View File

@ -669,7 +669,7 @@ template <typename T> class buffer {
size_(sz),
capacity_(cap) {}
~buffer() = default;
virtual ~buffer() = default;
/** Sets the buffer data and capacity. */
void set(T* buf_data, size_t buf_capacity) FMT_NOEXCEPT {

4
include/fmt/format.h
View File

@ -1609,7 +1609,7 @@ template <typename OutputIt, typename Char, typename UInt> struct int_writer {
char digits[40];
format_decimal(digits, abs_value, num_digits);
basic_memory_buffer<Char> buffer;
size += prefix_size;
size += static_cast<int>(prefix_size);
const auto usize = to_unsigned(size);
buffer.resize(usize);
basic_string_view<Char> s(&sep, sep_size);
@ -3482,7 +3482,7 @@ inline std::string to_string(T value) {
// The buffer should be large enough to store the number including the sign or
// "false" for bool.
constexpr int max_size = detail::digits10<T>() + 2;
char buffer[max_size > 5 ? max_size : 5];
char buffer[static_cast<size_t>(max_size > 5 ? max_size : 5)];
char* begin = buffer;
return std::string(begin, detail::write<char>(begin, value));
}

4
include/fmt/os.h
View File

@ -361,8 +361,8 @@ struct ostream_params {
ostream_params() {}
template <typename... T>
ostream_params(T... params, int oflag) : ostream_params(params...) {
this->oflag = oflag;
ostream_params(T... params, int _oflag) : ostream_params(params...) {
this->oflag = _oflag;
}
template <typename... T>

18
src/os.cc
View File

@ -92,11 +92,11 @@ int detail::utf16_to_utf8::convert(wstring_view s) {
int length = WideCharToMultiByte(CP_UTF8, 0, s.data(), s_size, nullptr, 0,
nullptr, nullptr);
if (length == 0) return GetLastError();
buffer_.resize(length + 1);
if (length == 0) return static_cast<int>(GetLastError());
buffer_.resize(static_cast<size_t>(length + 1));
length = WideCharToMultiByte(CP_UTF8, 0, s.data(), s_size, &buffer_[0],
length, nullptr, nullptr);
if (length == 0) return GetLastError();
if (length == 0) return static_cast<int>(GetLastError());
buffer_[length] = 0;
return 0;
}
@ -117,10 +117,10 @@ void detail::format_windows_error(detail::buffer<char>& out, int error_code,
buf.resize(inline_buffer_size);
for (;;) {
wchar_t* system_message = &buf[0];
int result = FormatMessageW(
int result = static_cast<int>(FormatMessageW(
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, nullptr,
error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), system_message,
static_cast<uint32_t>(buf.size()), nullptr);
static_cast<DWORD>(error_code), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), system_message,
static_cast<uint32_t>(buf.size()), nullptr));
if (result != 0) {
utf16_to_utf8 utf8_message;
if (utf8_message.convert(system_message) == ERROR_SUCCESS) {
@ -212,10 +212,10 @@ long long file::size() const {
if (size_lower == INVALID_FILE_SIZE) {
DWORD error = GetLastError();
if (error != NO_ERROR)
FMT_THROW(windows_error(GetLastError(), "cannot get file size"));
FMT_THROW(windows_error(static_cast<int>(GetLastError()), "cannot get file size"));
}
unsigned long long long_size = size_upper;
return (long_size << sizeof(DWORD) * CHAR_BIT) | size_lower;
return static_cast<long long int>((long_size << sizeof(DWORD) * CHAR_BIT) | size_lower);
# else
using Stat = struct stat;
Stat file_stat = Stat();
@ -306,7 +306,7 @@ long getpagesize() {
# ifdef _WIN32
SYSTEM_INFO si;
GetSystemInfo(&si);
return si.dwPageSize;
return static_cast<long int>(si.dwPageSize);
# else
long size = FMT_POSIX_CALL(sysconf(_SC_PAGESIZE));
if (size < 0) FMT_THROW(system_error(errno, "cannot get memory page size"));