diff options
| author | etienneb@chromium.org <etienneb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 05:22:02 +0000 |
|---|---|---|
| committer | etienneb@chromium.org <etienneb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 05:22:02 +0000 |
| commit | 793b6c2203475e2455ac98a47d049b638b6fcb6c (patch) | |
| tree | b88f2d79a6d6c23122a1f880c6efb30a9ff396d3 /base/bind_helpers.h | |
| parent | 6175b2446bd0d1056006f70ec9a5baa07c6ae8c3 (diff) | |
| download | chromium_src-793b6c2203475e2455ac98a47d049b638b6fcb6c.zip chromium_src-793b6c2203475e2455ac98a47d049b638b6fcb6c.tar.gz chromium_src-793b6c2203475e2455ac98a47d049b638b6fcb6c.tar.bz2 | |
Fix a misuse of pragma disable/default in a header file.
This may override the enable/disable of this warning in an other file which include base_helpers.h.
R=ajwong@chromium.org, erikwright@chromium.org
BUG=
Review URL: https://chromiumcodereview.appspot.com/20353002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214573 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/bind_helpers.h')
| -rw-r--r-- | base/bind_helpers.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/base/bind_helpers.h b/base/bind_helpers.h index 0ac9069..0cfaab7 100644 --- a/base/bind_helpers.h +++ b/base/bind_helpers.h @@ -237,12 +237,13 @@ class SupportsAddRefAndRelease { // common pattern for refcounted types. It does this even though no attempt to // instantiate Base is made. We disable the warning for this definition. #if defined(OS_WIN) +#pragma warning(push) #pragma warning(disable:4624) #endif struct Base : public T, public BaseMixin { }; #if defined(OS_WIN) -#pragma warning(default:4624) +#pragma warning(pop) #endif template <void(BaseMixin::*)(void)> struct Helper {}; |