diff --git a/third-party/easylogging++/easylogging++.cc b/third-party/easylogging++/easylogging++.cc index fcbb6da..8995ea8 100644 --- a/third-party/easylogging++/easylogging++.cc +++ b/third-party/easylogging++/easylogging++.cc @@ -1190,7 +1190,7 @@ std::string DateTime::timevalToString(struct timeval tval, const char* format, buildTimeInfo(&tval, &timeInfo); const int kBuffSize = 30; char buff_[kBuffSize] = ""; - parseFormat(buff_, kBuffSize, format, &timeInfo, static_cast(tval.tv_usec / ssPrec->m_offset), + parseFormat(buff_, kBuffSize, format, &timeInfo, static_cast(tval.tv_usec) / ssPrec->m_offset, ssPrec); return std::string(buff_); } @@ -1264,7 +1264,7 @@ char* DateTime::parseFormat(char* buf, std::size_t bufSz, const char* format, co --format; break; case 'd': // Day - buf = base::utils::Str::convertAndAddToBuff(tInfo->tm_mday, 2, buf, bufLim); + buf = base::utils::Str::convertAndAddToBuff(static_cast(tInfo->tm_mday), 2, buf, bufLim); continue; case 'a': // Day of week (short) 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); continue; case 'M': // month - buf = base::utils::Str::convertAndAddToBuff(tInfo->tm_mon + 1, 2, buf, bufLim); + buf = base::utils::Str::convertAndAddToBuff(static_cast(tInfo->tm_mon + 1), 2, buf, bufLim); continue; case 'b': // month (short) 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); continue; 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(tInfo->tm_year + base::consts::kYearBase), 2, buf, bufLim); continue; 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(tInfo->tm_year + base::consts::kYearBase), 4, buf, bufLim); continue; case 'h': // hour (12-hour) buf = base::utils::Str::convertAndAddToBuff(tInfo->tm_hour % 12, 2, buf, bufLim); continue; case 'H': // hour (24-hour) - buf = base::utils::Str::convertAndAddToBuff(tInfo->tm_hour, 2, buf, bufLim); + buf = base::utils::Str::convertAndAddToBuff(static_cast(tInfo->tm_hour), 2, buf, bufLim); continue; case 'm': // minute - buf = base::utils::Str::convertAndAddToBuff(tInfo->tm_min, 2, buf, bufLim); + buf = base::utils::Str::convertAndAddToBuff(static_cast(tInfo->tm_min), 2, buf, bufLim); continue; case 's': // second - buf = base::utils::Str::convertAndAddToBuff(tInfo->tm_sec, 2, buf, bufLim); + buf = base::utils::Str::convertAndAddToBuff(static_cast(tInfo->tm_sec), 2, buf, bufLim); continue; case 'z': // subsecond part case 'g': @@ -1553,7 +1553,7 @@ void LogFormat::updateDateFormat(std::size_t index, base::type::string_t& currFo } ss << static_cast(*ptr); } - currFormat.erase(index, count); + currFormat.erase(index, static_cast(count)); m_dateTimeFormat = ss.str(); } else { // 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 << "]"); return 0; } - return atol(confVal.c_str()); + return static_cast(atol(confVal.c_str())); } std::string TypedConfigurations::resolveFilename(const std::string& filename) { @@ -1765,7 +1765,7 @@ std::string TypedConfigurations::resolveFilename(const std::string& filename) { } ss << *ptr; } - resultingFilename.erase(dateIndex + dateTimeFormatSpecifierStr.size(), count); + resultingFilename.erase(dateIndex + dateTimeFormatSpecifierStr.size(), static_cast(count)); fmt = ss.str(); } else { 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( m_data->logMessage()->level()); if (fs != nullptr) { - fs->write(logLine.c_str(), logLine.size()); + fs->write(logLine.c_str(), static_cast(logLine.size())); if (fs->fail()) { ELPP_INTERNAL_ERROR("Unable to write log to file [" << 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_start(loggersList, loggerIds); const char* id = loggerIds; - m_loggerIds.reserve(count); + m_loggerIds.reserve(static_cast(count)); for (int i = 0; i < count; ++i) { m_loggerIds.push_back(std::string(id)); id = va_arg(loggersList, const char*);