Index: base/bind_helpers.h |
diff --git a/base/bind_helpers.h b/base/bind_helpers.h |
index 0ac9069c998b51bc550e4c4594f5149e8369c02a..0cfaab7ece74a5d07817313f977fb919a365c9ff 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) |
erikwright (departed)
2013/07/26 15:17:56
One could just pull the push outside of the #if de
awong
2013/07/26 17:50:09
I'm confused...don't the pragmas need to be inside
|
#endif |
template <void(BaseMixin::*)(void)> struct Helper {}; |