| Index: base/logging.cc
|
| diff --git a/base/logging.cc b/base/logging.cc
|
| index 89102fbe9c52b04d6c54cd092d3da82dee04bf39..9fe235cc93546ba779f707522f854f2a28f4d185 100644
|
| --- a/base/logging.cc
|
| +++ b/base/logging.cc
|
| @@ -537,19 +537,10 @@ 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) {
|
|
|