diff --git a/include/mbgl/actor/actor.hpp b/include/mbgl/actor/actor.hpp index f5a4bfa10d4..071217e04fa 100644 --- a/include/mbgl/actor/actor.hpp +++ b/include/mbgl/actor/actor.hpp @@ -62,7 +62,7 @@ class Actor { template Actor(Scheduler& scheduler, Args&&... args) : target(scheduler, parent, std::forward(args)...) {} - + template Actor(const TaggedScheduler& scheduler, Args&&... args) : retainer(scheduler.get()), diff --git a/include/mbgl/actor/established_actor.hpp b/include/mbgl/actor/established_actor.hpp index 5246e1c61b6..6cfa755f391 100644 --- a/include/mbgl/actor/established_actor.hpp +++ b/include/mbgl/actor/established_actor.hpp @@ -33,7 +33,7 @@ class EstablishedActor { class... Args, typename std::enable_if_t || std::is_constructible_v, Args...>>* = nullptr> - EstablishedActor(Scheduler& scheduler, AspiringActor& parent_, Args&&... args) + EstablishedActor(Scheduler& scheduler, AspiringActor& parent_, Args&&... args) : parent(parent_) { emplaceObject(std::forward(args)...); parent.mailbox->open(scheduler); diff --git a/src/mbgl/gl/renderer_backend.cpp b/src/mbgl/gl/renderer_backend.cpp index 9b10b502b2c..eae4c61c8be 100644 --- a/src/mbgl/gl/renderer_backend.cpp +++ b/src/mbgl/gl/renderer_backend.cpp @@ -19,7 +19,8 @@ RendererBackend::RendererBackend(const gfx::ContextMode contextMode_) : gfx::RendererBackend(contextMode_) {} std::unique_ptr RendererBackend::createContext() { - auto result = std::make_unique(*this); // Tagged background thread pool will be owned by the RendererBackend + auto result = std::make_unique( + *this); // Tagged background thread pool will be owned by the RendererBackend result->enableDebugging(); result->initializeExtensions(std::bind(&RendererBackend::getExtensionFunctionPointer, this, std::placeholders::_1)); return result; diff --git a/src/mbgl/mtl/renderer_backend.cpp b/src/mbgl/mtl/renderer_backend.cpp index 873eba70c12..4fea2ca76d4 100644 --- a/src/mbgl/mtl/renderer_backend.cpp +++ b/src/mbgl/mtl/renderer_backend.cpp @@ -53,7 +53,7 @@ RendererBackend::~RendererBackend() = default; std::unique_ptr RendererBackend::createContext() { return std::make_unique(*this, - TaggedScheduler{Scheduler::GetBackground(), static_cast(owner)}); + TaggedScheduler{Scheduler::GetBackground(), static_cast(owner)}); } PremultipliedImage RendererBackend::readFramebuffer(const Size& size) { diff --git a/src/mbgl/renderer/render_orchestrator.cpp b/src/mbgl/renderer/render_orchestrator.cpp index 515f2eb8bd3..9961b0bc8ec 100644 --- a/src/mbgl/renderer/render_orchestrator.cpp +++ b/src/mbgl/renderer/render_orchestrator.cpp @@ -111,7 +111,9 @@ class RenderTreeImpl final : public RenderTree { } // namespace -RenderOrchestrator::RenderOrchestrator(bool backgroundLayerAsColor_, TaggedScheduler& threadPool_, const std::optional& localFontFamily_) +RenderOrchestrator::RenderOrchestrator(bool backgroundLayerAsColor_, + TaggedScheduler& threadPool_, + const std::optional& localFontFamily_) : observer(&nullObserver()), glyphManager(std::make_unique(std::make_unique(localFontFamily_))), imageManager(std::make_unique()), diff --git a/src/mbgl/renderer/render_orchestrator.hpp b/src/mbgl/renderer/render_orchestrator.hpp index e035a817dce..3ec1fe6dddc 100644 --- a/src/mbgl/renderer/render_orchestrator.hpp +++ b/src/mbgl/renderer/render_orchestrator.hpp @@ -56,7 +56,9 @@ using ImmutableLayer = Immutable; class RenderOrchestrator final : public GlyphManagerObserver, public ImageManagerObserver, public RenderSourceObserver { public: - RenderOrchestrator(bool backgroundLayerAsColor_, TaggedScheduler& threadPool_, const std::optional& localFontFamily_); + RenderOrchestrator(bool backgroundLayerAsColor_, + TaggedScheduler& threadPool_, + const std::optional& localFontFamily_); ~RenderOrchestrator() override; void markContextLost() { contextLost = true; }; diff --git a/test/api/custom_drawable_layer.test.cpp b/test/api/custom_drawable_layer.test.cpp index 33d36cd38f4..18575d22eb6 100644 --- a/test/api/custom_drawable_layer.test.cpp +++ b/test/api/custom_drawable_layer.test.cpp @@ -108,8 +108,9 @@ class LineTestDrawableLayer : public mbgl::style::CustomDrawableLayerHost { constexpr auto numPoints = 100; GeometryCoordinates polyline; for (auto ipoint{0}; ipoint < numPoints; ++ipoint) { - polyline.emplace_back(ipoint * util::EXTENT / numPoints, - static_cast(std::sin(ipoint * 2 * M_PI / numPoints) * util::EXTENT / numLines / 2.f)); + polyline.emplace_back( + ipoint * util::EXTENT / numPoints, + static_cast(std::sin(ipoint * 2 * M_PI / numPoints) * util::EXTENT / numLines / 2.f)); } for (auto index{0}; index < numLines; ++index) {