SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix -Wsign-conversion warnings in easylogging++

Browse Source
This commit is contained in:
Vasily
2019-02-21 18:48:53 +01:00
committed by username223
parent cfefec59e3
commit 775d0e0e36
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
third-party/easylogging++/easylogging++.cc
Vendored
+13 -13
View File
@@ -1190,7 +1190,7 @@ std::string DateTime::timevalToString(struct timeval tval, const char* format,
buildTimeInfo(&tval, &timeInfo); buildTimeInfo(&tval, &timeInfo);
const int kBuffSize = 30; const int kBuffSize = 30;
char buff_[kBuffSize] = ""; char buff_[kBuffSize] = "";
parseFormat(buff_, kBuffSize, format, &timeInfo, static_cast<std::size_t>(tval.tv_usec / ssPrec->m_offset), parseFormat(buff_, kBuffSize, format, &timeInfo, static_cast<unsigned long>(tval.tv_usec) / ssPrec->m_offset,
ssPrec); ssPrec);
return std::string(buff_); return std::string(buff_);
} }
@@ -1264,7 +1264,7 @@ char* DateTime::parseFormat(char* buf, std::size_t bufSz, const char* format, co
--format; --format;
break; break;
case 'd': // Day case 'd': // Day
buf = base::utils::Str::convertAndAddToBuff(tInfo->tm_mday, 2, buf, bufLim); buf = base::utils::Str::convertAndAddToBuff(static_cast<size_t>(tInfo->tm_mday), 2, buf, bufLim);
continue; continue;
case 'a': // Day of week (short) case 'a': // Day of week (short)
buf = base::utils::Str::addToBuff(base::consts::kDaysAbbrev[tInfo->tm_wday], buf, bufLim); buf = base::utils::Str::addToBuff(base::consts::kDaysAbbrev[tInfo->tm_wday], buf, bufLim);
@@ -1273,7 +1273,7 @@ char* DateTime::parseFormat(char* buf, std::size_t bufSz, const char* format, co
buf = base::utils::Str::addToBuff(base::consts::kDays[tInfo->tm_wday], buf, bufLim); buf = base::utils::Str::addToBuff(base::consts::kDays[tInfo->tm_wday], buf, bufLim);
continue; continue;
case 'M': // month case 'M': // month
buf = base::utils::Str::convertAndAddToBuff(tInfo->tm_mon + 1, 2, buf, bufLim); buf = base::utils::Str::convertAndAddToBuff(static_cast<size_t>(tInfo->tm_mon + 1), 2, buf, bufLim);
continue; continue;
case 'b': // month (short) case 'b': // month (short)
buf = base::utils::Str::addToBuff(base::consts::kMonthsAbbrev[tInfo->tm_mon], buf, bufLim); buf = base::utils::Str::addToBuff(base::consts::kMonthsAbbrev[tInfo->tm_mon], buf, bufLim);
@@ -1282,22 +1282,22 @@ char* DateTime::parseFormat(char* buf, std::size_t bufSz, const char* format, co
buf = base::utils::Str::addToBuff(base::consts::kMonths[tInfo->tm_mon], buf, bufLim); buf = base::utils::Str::addToBuff(base::consts::kMonths[tInfo->tm_mon], buf, bufLim);
continue; continue;
case 'y': // year (two digits) case 'y': // year (two digits)
buf = base::utils::Str::convertAndAddToBuff(tInfo->tm_year + base::consts::kYearBase, 2, buf, bufLim); buf = base::utils::Str::convertAndAddToBuff(static_cast<size_t>(tInfo->tm_year + base::consts::kYearBase), 2, buf, bufLim);
continue; continue;
case 'Y': // year (four digits) case 'Y': // year (four digits)
buf = base::utils::Str::convertAndAddToBuff(tInfo->tm_year + base::consts::kYearBase, 4, buf, bufLim); buf = base::utils::Str::convertAndAddToBuff(static_cast<size_t>(tInfo->tm_year + base::consts::kYearBase), 4, buf, bufLim);
continue; continue;
case 'h': // hour (12-hour) case 'h': // hour (12-hour)
buf = base::utils::Str::convertAndAddToBuff(tInfo->tm_hour % 12, 2, buf, bufLim); buf = base::utils::Str::convertAndAddToBuff(tInfo->tm_hour % 12, 2, buf, bufLim);
continue; continue;
case 'H': // hour (24-hour) case 'H': // hour (24-hour)
buf = base::utils::Str::convertAndAddToBuff(tInfo->tm_hour, 2, buf, bufLim); buf = base::utils::Str::convertAndAddToBuff(static_cast<size_t>(tInfo->tm_hour), 2, buf, bufLim);
continue; continue;
case 'm': // minute case 'm': // minute
buf = base::utils::Str::convertAndAddToBuff(tInfo->tm_min, 2, buf, bufLim); buf = base::utils::Str::convertAndAddToBuff(static_cast<size_t>(tInfo->tm_min), 2, buf, bufLim);
continue; continue;
case 's': // second case 's': // second
buf = base::utils::Str::convertAndAddToBuff(tInfo->tm_sec, 2, buf, bufLim); buf = base::utils::Str::convertAndAddToBuff(static_cast<size_t>(tInfo->tm_sec), 2, buf, bufLim);
continue; continue;
case 'z': // subsecond part case 'z': // subsecond part
case 'g': case 'g':
@@ -1553,7 +1553,7 @@ void LogFormat::updateDateFormat(std::size_t index, base::type::string_t& currFo
} }
ss << static_cast<char>(*ptr); ss << static_cast<char>(*ptr);
} }
currFormat.erase(index, count); currFormat.erase(index, static_cast<size_t>(count));
m_dateTimeFormat = ss.str(); m_dateTimeFormat = ss.str();
} else { } else {
// No format provided, use default // No format provided, use default
@@ -1737,7 +1737,7 @@ unsigned long TypedConfigurations::getULong(std::string confVal) {
ELPP_ASSERT(valid, "Configuration value not a valid integer [" << confVal << "]"); ELPP_ASSERT(valid, "Configuration value not a valid integer [" << confVal << "]");
return 0; return 0;
} }
return atol(confVal.c_str()); return static_cast<unsigned long>(atol(confVal.c_str()));
} }
std::string TypedConfigurations::resolveFilename(const std::string& filename) { std::string TypedConfigurations::resolveFilename(const std::string& filename) {
@@ -1765,7 +1765,7 @@ std::string TypedConfigurations::resolveFilename(const std::string& filename) {
} }
ss << *ptr; ss << *ptr;
} }
resultingFilename.erase(dateIndex + dateTimeFormatSpecifierStr.size(), count); resultingFilename.erase(dateIndex + dateTimeFormatSpecifierStr.size(), static_cast<size_t>(count));
fmt = ss.str(); fmt = ss.str();
} else { } else {
fmt = std::string(base::consts::kDefaultDateTimeFormatInFilename); fmt = std::string(base::consts::kDefaultDateTimeFormatInFilename);
@@ -2219,7 +2219,7 @@ void DefaultLogDispatchCallback::dispatch(base::type::string_t&& logLine) {
base::type::fstream_t* fs = m_data->logMessage()->logger()->m_typedConfigurations->fileStream( base::type::fstream_t* fs = m_data->logMessage()->logger()->m_typedConfigurations->fileStream(
m_data->logMessage()->level()); m_data->logMessage()->level());
if (fs != nullptr) { if (fs != nullptr) {
fs->write(logLine.c_str(), logLine.size()); fs->write(logLine.c_str(), static_cast<std::streamsize>(logLine.size()));
if (fs->fail()) { if (fs->fail()) {
ELPP_INTERNAL_ERROR("Unable to write log to file [" ELPP_INTERNAL_ERROR("Unable to write log to file ["
<< m_data->logMessage()->logger()->m_typedConfigurations->filename(m_data->logMessage()->level()) << "].\n" << m_data->logMessage()->logger()->m_typedConfigurations->filename(m_data->logMessage()->level()) << "].\n"
@@ -2541,7 +2541,7 @@ Writer& Writer::construct(int count, const char* loggerIds, ...) {
va_list loggersList; va_list loggersList;
va_start(loggersList, loggerIds); va_start(loggersList, loggerIds);
const char* id = loggerIds; const char* id = loggerIds;
m_loggerIds.reserve(count); m_loggerIds.reserve(static_cast<size_t>(count));
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
m_loggerIds.push_back(std::string(id)); m_loggerIds.push_back(std::string(id));
id = va_arg(loggersList, const char*); id = va_arg(loggersList, const char*);