diff options
| author |  Kevin Lubick <kjlubick@google.com> | 2018-06-01 13:00:35 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-01 17:28:56 +0000 |
| commit | f14bc98b2f003bd273875da94016eaa690e6d9de (patch) | |
| tree | d80fc5a8dbab424d7269cd7e62c5177c26ce4761 /modules | |
| parent | 2b23c4bf3186bf3fa71bb105afdcf3b8e5995b52 (diff) | |
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 <kjlubick@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/skottie/src/Skottie.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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> Animation::Make(SkStream* stream, const ResourceProvider* provi std::unique_ptr<SkStream> openStream(const char[]) const { return nullptr; } }; - const NullResourceProvider null_provider; + NullResourceProvider null_provider; const auto anim = sk_sp<Animation>(new Animation(provider ? *provider : null_provider, std::move(version), size, fps, json, stats)); const auto t2 = SkTime::GetMSecs(); |