From ecaf162afb1c0e7a5abda6c4bde1e034ea28e061 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Mon, 23 Apr 2018 20:41:36 -0700 Subject: [PATCH] Fixing PR build --- libraries/qml/src/qml/OffscreenSurface.cpp | 1 - tests/render-perf/src/main.cpp | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/qml/src/qml/OffscreenSurface.cpp b/libraries/qml/src/qml/OffscreenSurface.cpp index 53a8998977..688f3fdb5f 100644 --- a/libraries/qml/src/qml/OffscreenSurface.cpp +++ b/libraries/qml/src/qml/OffscreenSurface.cpp @@ -67,7 +67,6 @@ OffscreenSurface::OffscreenSurface() OffscreenSurface::~OffscreenSurface() { delete _sharedObject; - const_cast(_sharedObject) = nullptr; } bool OffscreenSurface::fetchTexture(TextureAndFence& textureAndFence) { diff --git a/tests/render-perf/src/main.cpp b/tests/render-perf/src/main.cpp index 93672cc5a2..9249b3d957 100644 --- a/tests/render-perf/src/main.cpp +++ b/tests/render-perf/src/main.cpp @@ -453,8 +453,8 @@ protected: return vec3(); } - bool isAboutToQuit() const override { return false; } - void postLambdaEvent(std::function f) override {} + void postLambdaEvent(const std::function& f) override {} + void sendLambdaEvent(const std::function& f) override {} qreal getDevicePixelRatio() override { return 1.0f; @@ -469,7 +469,7 @@ protected: } std::map> _postUpdateLambdas; - void pushPostUpdateLambda(void* key, std::function func) override { + void pushPostUpdateLambda(void* key, const std::function& func) override { _postUpdateLambdas[key] = func; }