diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-16 20:16:54 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-16 20:16:54 +0000 |
| commit | a9e00b45a794ca4d95f9d7ccd29cbad1b31afcf3 (patch) | |
| tree | cb4dd81b1b31ebcb354bd040118cd2b8aa62c1b0 | |
| parent | 937fe5204ebc1ecd457e472565f948a573c4ddfa (diff) | |
| download | chromium_src-a9e00b45a794ca4d95f9d7ccd29cbad1b31afcf3.zip chromium_src-a9e00b45a794ca4d95f9d7ccd29cbad1b31afcf3.tar.gz chromium_src-a9e00b45a794ca4d95f9d7ccd29cbad1b31afcf3.tar.bz2 | |
Reverting 20497.
BUG=16512,16871
Review URL: http://codereview.chromium.org/149765
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20889 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/logging.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/base/logging.h b/base/logging.h index c2bad4e..db7faca 100644 --- a/base/logging.h +++ b/base/logging.h @@ -280,11 +280,7 @@ std::string* MakeCheckOpString(const int& v1, // foo.CheckThatFoo(); // #endif -// http://crbug.com/16512 is open for a real fix for this. For now, Windows -// uses OFFICIAL_BUILD and !Windows uses the branding flag when NDEBUG is -// defined. -#if ( defined(OS_WIN) && defined(OFFICIAL_BUILD)) || \ - (!defined(OS_WIN) && defined(NDEBUG) && defined(GOOGLE_CHROME_BUILD)) +#ifdef OFFICIAL_BUILD // We want to have optimized code for an official build so we remove DLOGS and // DCHECK from the executable. |