From ab374cf894f136418ad573dfb5da4fcb48f47db0 Mon Sep 17 00:00:00 2001 From: mtklein Date: Mon, 24 Aug 2015 12:33:19 -0700 Subject: Explicitly friend ::SkPrivateEffectInitializer to flattenables. Looks like the -Wmicrosoft warnings in the bug are coming up specificically because many the effects in SkLightingImageFilter are defined inside an anonymous namespace (spanning, I think, lines 33-702 today). BUG=skia:4091 No public API changes. TBR=reed@google.com Review URL: https://codereview.chromium.org/1311783004 --- include/core/SkFlattenable.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/core/SkFlattenable.h') diff --git a/include/core/SkFlattenable.h b/include/core/SkFlattenable.h index 208b71ef26..66a84f3d29 100644 --- a/include/core/SkFlattenable.h +++ b/include/core/SkFlattenable.h @@ -13,6 +13,8 @@ class SkReadBuffer; class SkWriteBuffer; +class SkPrivateEffectInitializer; + /* * Flattening is straight-forward: * 1. call getFactory() so we have a function-ptr to recreate the subclass @@ -47,7 +49,7 @@ class SkWriteBuffer; #define SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(flattenable) \ private: \ static SkFlattenable* CreateProc(SkReadBuffer&); \ - friend class SkPrivateEffectInitializer; \ + friend class ::SkPrivateEffectInitializer; \ public: \ Factory getFactory() const override { return CreateProc; } -- cgit v1.2.3