diff options
| author | sebmarchand@chromium.org <sebmarchand@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-04 09:10:10 +0000 |
|---|---|---|
| committer | sebmarchand@chromium.org <sebmarchand@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-04 09:10:10 +0000 |
| commit | 86dcc9d7d63c49f121b6b6d08af46fcce82d2fef (patch) | |
| tree | f5fea36f5c6363bf3819819e6bea0f7af09b698b /base/logging.cc | |
| parent | fc8e0880efdbdca30ae828b9ee5e11f6810cfa8e (diff) | |
| download | chromium_src-86dcc9d7d63c49f121b6b6d08af46fcce82d2fef.zip chromium_src-86dcc9d7d63c49f121b6b6d08af46fcce82d2fef.tar.gz chromium_src-86dcc9d7d63c49f121b6b6d08af46fcce82d2fef.tar.bz2 | |
Disable warning C4702 in logging.cc
BUG=380175
Review URL: https://codereview.chromium.org/315663003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/logging.cc')
| -rw-r--r-- | base/logging.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/base/logging.cc b/base/logging.cc index 9fe235c..89102fb 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) { |