diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-07-24 21:25:21 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-08-08 14:14:34 +0300 |
commit | 3952ff5c343844d76f75ede0afc8ddad55748a0d (patch) | |
tree | d19172ad104ba520f7f8d1d939a1690791606993 /platform | |
parent | 990b3b11b9427ffd86f693d3f4c3dd351891e5d0 (diff) | |
download | qtlocation-mapboxgl-3952ff5c343844d76f75ede0afc8ddad55748a0d.tar.gz |
[core] Replace unique_any with peer from mapbox-bindgen
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/src/style/sources/source.cpp | 4 | ||||
-rw-r--r-- | platform/darwin/src/MGLStyle.mm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/platform/android/src/style/sources/source.cpp b/platform/android/src/style/sources/source.cpp index 413530a5ec..5f68e40467 100644 --- a/platform/android/src/style/sources/source.cpp +++ b/platform/android/src/style/sources/source.cpp @@ -51,7 +51,7 @@ namespace android { if (!coreSource.peer.has_value()) { coreSource.peer = createSourcePeer(env, coreSource, frontend); } - return *mbgl::util::any_cast<std::unique_ptr<Source>>(&coreSource.peer)->get()->javaPeer; + return *coreSource.peer.get<std::unique_ptr<Source>>()->javaPeer; } Source::Source(jni::JNIEnv& env, mbgl::style::Source& coreSource, jni::Object<Source> obj, AndroidRendererFrontend& frontend) @@ -125,7 +125,7 @@ namespace android { // Release the peer relationships. These will be re-established when the source is added to a map assert(ownedSource->peer.has_value()); - util::any_cast<std::unique_ptr<Source>>(&(ownedSource->peer))->release(); + ownedSource->peer.get<std::unique_ptr<Source>>().release(); ownedSource->peer.reset(); // Release the strong reference to the java peer diff --git a/platform/darwin/src/MGLStyle.mm b/platform/darwin/src/MGLStyle.mm index 3f9bfbf8ca..e0415c02f7 100644 --- a/platform/darwin/src/MGLStyle.mm +++ b/platform/darwin/src/MGLStyle.mm @@ -177,7 +177,7 @@ static_assert(6 == mbgl::util::default_styles::numOrderedStyles, } - (MGLSource *)sourceFromMBGLSource:(mbgl::style::Source *)rawSource { - if (MGLSource *source = rawSource->peer.has_value() ? mbgl::util::any_cast<SourceWrapper>(rawSource->peer).source : nil) { + if (MGLSource *source = rawSource->peer.has_value() ? rawSource->peer.get<SourceWrapper>().source : nil) { return source; } @@ -341,7 +341,7 @@ static_assert(6 == mbgl::util::default_styles::numOrderedStyles, { NSParameterAssert(rawLayer); - if (MGLStyleLayer *layer = rawLayer->peer.has_value() ? mbgl::util::any_cast<LayerWrapper>(&(rawLayer->peer))->layer : nil) { + if (MGLStyleLayer *layer = rawLayer->peer.has_value() ? rawLayer->peer.get<LayerWrapper>().layer : nil) { return layer; } |