caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed LogLevel members, to prevent issue with system defines on Windows

Browse Source
This commit is contained in:
Miodrag Milanovic 2018-12-05 19:58:38 +01:00
parent 697e2ed490
commit a6315833d3
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/command.cc
View File

@ -131,9 +131,9 @@ void CommandHandler::setupContext(Context *ctx)
} }
if (vm.count("quiet")) { if (vm.count("quiet")) {
log_streams.push_back(std::make_pair(&std::cerr, LogLevel::WARNING)); log_streams.push_back(std::make_pair(&std::cerr, LogLevel::WARNING_MSG));
} else { } else {
log_streams.push_back(std::make_pair(&std::cerr, LogLevel::LOG)); log_streams.push_back(std::make_pair(&std::cerr, LogLevel::LOG_MSG));
} }
if (vm.count("log")) { if (vm.count("log")) {
@ -141,7 +141,7 @@ void CommandHandler::setupContext(Context *ctx)
logfile = std::ofstream(logfilename); logfile = std::ofstream(logfilename);
if (!logfile) if (!logfile)
log_error("Failed to open log file '%s' for writing.\n", logfilename.c_str()); log_error("Failed to open log file '%s' for writing.\n", logfilename.c_str());
log_streams.push_back(std::make_pair(&logfile, LogLevel::LOG)); log_streams.push_back(std::make_pair(&logfile, LogLevel::LOG_MSG));
} }
if (vm.count("force")) { if (vm.count("force")) {
@ -285,8 +285,8 @@ void CommandHandler::conflicting_options(const boost::program_options::variables
void CommandHandler::printFooter() void CommandHandler::printFooter()
{ {
int warning_count = get_or_default(message_count_by_level, LogLevel::WARNING, 0), int warning_count = get_or_default(message_count_by_level, LogLevel::WARNING_MSG, 0),
error_count = get_or_default(message_count_by_level, LogLevel::ERROR, 0); error_count = get_or_default(message_count_by_level, LogLevel::ERROR_MSG, 0);
if (warning_count > 0 || error_count > 0) if (warning_count > 0 || error_count > 0)
log_always("%d warning%s, %d error%s\n", warning_count, warning_count == 1 ? "" : "s", error_count, log_always("%d warning%s, %d error%s\n", warning_count, warning_count == 1 ? "" : "s", error_count,
error_count == 1 ? "" : "s"); error_count == 1 ? "" : "s");

14
common/log.cc
View File

@ -84,7 +84,7 @@ std::string vstringf(const char *fmt, va_list ap)
return string; return string;
} }
void logv(const char *format, va_list ap, LogLevel level = LogLevel::LOG) void logv(const char *format, va_list ap, LogLevel level = LogLevel::LOG_MSG)
{ {
// //
// Trim newlines from the beginning // Trim newlines from the beginning
@ -132,7 +132,7 @@ void log_always(const char *format, ...)
{ {
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
logv(format, ap, LogLevel::ALWAYS); logv(format, ap, LogLevel::ALWAYS_MSG);
va_end(ap); va_end(ap);
} }
@ -140,7 +140,7 @@ void log(const char *format, ...)
{ {
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
logv(format, ap, LogLevel::LOG); logv(format, ap, LogLevel::LOG_MSG);
va_end(ap); va_end(ap);
} }
@ -148,7 +148,7 @@ void log_info(const char *format, ...)
{ {
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
logv_prefixed("Info: ", format, ap, LogLevel::INFO); logv_prefixed("Info: ", format, ap, LogLevel::INFO_MSG);
va_end(ap); va_end(ap);
} }
@ -156,7 +156,7 @@ void log_warning(const char *format, ...)
{ {
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
logv_prefixed("Warning: ", format, ap, LogLevel::WARNING); logv_prefixed("Warning: ", format, ap, LogLevel::WARNING_MSG);
va_end(ap); va_end(ap);
} }
@ -164,7 +164,7 @@ void log_error(const char *format, ...)
{ {
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
logv_prefixed("ERROR: ", format, ap, LogLevel::ERROR); logv_prefixed("ERROR: ", format, ap, LogLevel::ERROR_MSG);
if (log_error_atexit) if (log_error_atexit)
log_error_atexit(); log_error_atexit();
@ -184,7 +184,7 @@ void log_nonfatal_error(const char *format, ...)
{ {
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
logv_prefixed("ERROR: ", format, ap, LogLevel::ERROR); logv_prefixed("ERROR: ", format, ap, LogLevel::ERROR_MSG);
va_end(ap); va_end(ap);
had_nonfatal_error = true; had_nonfatal_error = true;
} }

10
common/log.h
View File

@ -44,11 +44,11 @@ struct log_execution_error_exception
enum class LogLevel enum class LogLevel
{ {
LOG, LOG_MSG,
INFO, INFO_MSG,
WARNING, WARNING_MSG,
ERROR, ERROR_MSG,
ALWAYS ALWAYS_MSG
}; };
extern std::vector<std::pair<std::ostream *, LogLevel>> log_streams; extern std::vector<std::pair<std::ostream *, LogLevel>> log_streams;