Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(470)

Unified Diff: base/logging.cc

Issue 315663003: Disable warning C4702 in logging.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add a TODO. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/logging.cc
diff --git a/base/logging.cc b/base/logging.cc
index 9fe235cc93546ba779f707522f854f2a28f4d185..89102fbe9c52b04d6c54cd092d3da82dee04bf39 100644
--- a/base/logging.cc
+++ b/base/logging.cc
@@ -537,10 +537,19 @@ LogMessage::LogMessage(const char* file, int line)
Init(file, line);
}
+#if defined(OS_WIN)
+// Disable warning C4702 ("unreachable code") until we fix crbug.com/380175.
+// TODO(scottmg|sebmarchand): Remove this pragma once the bug is fixed.
+#pragma warning(push)
+#pragma warning(disable: 4702)
+#endif
LogMessage::LogMessage(const char* file, int line, LogSeverity severity)
: severity_(severity), file_(file), line_(line) {
Init(file, line);
}
+#if defined(OS_WIN)
+#pragma warning(pop)
+#endif
LogMessage::LogMessage(const char* file, int line, std::string* result)
: severity_(LOG_FATAL), file_(file), line_(line) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698