Skip to content

Commit

Permalink
Fix a misuse of pragma disable/default in a header file.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
etienneb@chromium.org committed Jul 31, 2013
1 parent 6175b24 commit 793b6c2
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion base/bind_helpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {};
Expand Down

0 comments on commit 793b6c2

Please sign in to comment.