From f14bc98b2f003bd273875da94016eaa690e6d9de Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Fri, 1 Jun 2018 13:00:35 -0400 Subject: Avoid compilation error on older compilers The constness on null_provider causes: "default initialization of an object of const type 'const NullResourceProvider' without a user-provided default constructor" See https://stackoverflow.com/a/47368753 for more. TL;DR; clang 3.8 and older is not happy Bug: skia: Change-Id: Icfc38680163c3bd4952c0e35551706cad8dbfee6 Reviewed-on: https://skia-review.googlesource.com/131521 Commit-Queue: Kevin Lubick Commit-Queue: Florin Malita Reviewed-by: Florin Malita --- modules/skottie/src/Skottie.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/skottie/src/Skottie.cpp b/modules/skottie/src/Skottie.cpp index d2c2cceb5a..93c71e936a 100644 --- a/modules/skottie/src/Skottie.cpp +++ b/modules/skottie/src/Skottie.cpp @@ -1231,7 +1231,7 @@ sk_sp Animation::Make(SkStream* stream, const ResourceProvider* provi std::unique_ptr openStream(const char[]) const { return nullptr; } }; - const NullResourceProvider null_provider; + NullResourceProvider null_provider; const auto anim = sk_sp(new Animation(provider ? *provider : null_provider, std::move(version), size, fps, json, stats)); const auto t2 = SkTime::GetMSecs(); -- cgit v1.2.3