diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-21 18:48:52 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-21 18:48:52 +0000 |
| commit | 0eb9f434fb019da43b97c81d7e314885d43af0f9 (patch) | |
| tree | 8e7bb2901b0e285ee2ce2875d241852ff14a168d /chrome/common/logging_chrome.cc | |
| parent | f1a0eae704dcc8848847201d48922aa1984e522a (diff) | |
| download | chromium_src-0eb9f434fb019da43b97c81d7e314885d43af0f9.zip chromium_src-0eb9f434fb019da43b97c81d7e314885d43af0f9.tar.gz chromium_src-0eb9f434fb019da43b97c81d7e314885d43af0f9.tar.bz2 | |
Wrap MSVC-specific pragmas. As -Wunknown-pragmas has been disabled for wtf,
some of these sneaked in.
BUG=2053
Review URL: http://codereview.chromium.org/11801
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/logging_chrome.cc')
| -rw-r--r-- | chrome/common/logging_chrome.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc index b2a8381..575283b 100644 --- a/chrome/common/logging_chrome.cc +++ b/chrome/common/logging_chrome.cc @@ -14,6 +14,7 @@ #include "chrome/common/logging_chrome.h" #include "base/command_line.h" +#include "base/compiler_specific.h" #include "base/debug_util.h" #include "base/file_util.h" #include "base/logging.h" @@ -34,11 +35,11 @@ static bool chrome_logging_initialized_ = false; // Assertion handler for logging errors that occur when dialogs are // silenced. To record a new error, pass the log string associated // with that error in the str parameter. -#pragma optimize("", off) +MSVC_DISABLE_OPTIMIZE(); static void SilentRuntimeAssertHandler(const std::string& str) { DebugUtil::BreakDebugger(); } -#pragma optimize("", on) +MSVC_ENABLE_OPTIMIZE(); // Suppresses error/assertion dialogs and enables the logging of // those errors into silenced_errors_. |