diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-03 13:28:55 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-08 16:36:47 -0700 |
| commit | 030234c7a6c7f6c5a901dab68591c9cfb2d4828f (patch) | |
| tree | 669e831aecdd9cd74173cb93088b13979887e81e /platform/default | |
| parent | e4995e8d3a38dfd2ed64337e712ecf701af37454 (diff) | |
| download | qtlocation-mapboxgl-030234c7a6c7f6c5a901dab68591c9cfb2d4828f.tar.gz | |
[core] Rework invokeWithCallback so that the callback is last
Diffstat (limited to 'platform/default')
| -rw-r--r-- | platform/default/asset_file_source.cpp | 2 | ||||
| -rw-r--r-- | platform/default/default_file_source.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/default/asset_file_source.cpp b/platform/default/asset_file_source.cpp index 2872c6bb3a..1832818378 100644 --- a/platform/default/asset_file_source.cpp +++ b/platform/default/asset_file_source.cpp @@ -64,7 +64,7 @@ AssetFileSource::AssetFileSource(const std::string& root) AssetFileSource::~AssetFileSource() = default; std::unique_ptr<AsyncRequest> AssetFileSource::request(const Resource& resource, Callback callback) { - return thread->invokeWithCallback(&Impl::request, callback, resource.url); + return thread->invokeWithCallback(&Impl::request, resource.url, callback); } } // namespace mbgl diff --git a/platform/default/default_file_source.cpp b/platform/default/default_file_source.cpp index 6a94fa3866..9465728509 100644 --- a/platform/default/default_file_source.cpp +++ b/platform/default/default_file_source.cpp @@ -164,7 +164,7 @@ std::unique_ptr<AsyncRequest> DefaultFileSource::request(const Resource& resourc public: DefaultFileRequest(Resource resource_, FileSource::Callback callback_, util::Thread<DefaultFileSource::Impl>& thread_) : thread(thread_), - workRequest(thread.invokeWithCallback(&DefaultFileSource::Impl::request, callback_, this, resource_)) { + workRequest(thread.invokeWithCallback(&DefaultFileSource::Impl::request, this, resource_, callback_)) { } ~DefaultFileRequest() override { |