From 7258bcfaa0bdbaa9a70e2d749bcbed571416c597 Mon Sep 17 00:00:00 2001 From: Sebastian Willenbrink Date: Wed, 14 Sep 2022 09:29:41 +0200 Subject: [PATCH 1/2] Avoid implicit this-> in operator() --- include/inviwo/core/network/lambdanetworkvisitor.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/inviwo/core/network/lambdanetworkvisitor.h b/include/inviwo/core/network/lambdanetworkvisitor.h index 0f859ab4d72..9a05b5bd77e 100644 --- a/include/inviwo/core/network/lambdanetworkvisitor.h +++ b/include/inviwo/core/network/lambdanetworkvisitor.h @@ -75,16 +75,16 @@ struct LambdaNetworkVisitor : NetworkVisitor, Funcs... { virtual bool visit([[maybe_unused]] Processor& processor) override { if constexpr (util::is_detected_exact_v) { - return operator()(processor); + return this->operator()(processor); } else { return true; } } virtual bool visit([[maybe_unused]] CanvasProcessor& processor) override { if constexpr (util::is_detected_exact_v) { - return operator()(processor); + return this->operator()(processor); } else if constexpr (util::is_detected_exact_v) { - return operator()(processor); + return this->operator()(processor); } else { return true; } @@ -92,16 +92,16 @@ struct LambdaNetworkVisitor : NetworkVisitor, Funcs... { virtual bool visit([[maybe_unused]] Property& property) override { if constexpr (util::is_detected_exact_v) { - return operator()(property); + return this->operator()(property); } else { return true; } } virtual bool visit([[maybe_unused]] CompositeProperty& compositeProperty) override { if constexpr (util::is_detected_exact_v) { - return operator()(compositeProperty); + return this->operator()(compositeProperty); } else if constexpr (util::is_detected_exact_v) { - return operator()(compositeProperty); + return this->operator()(compositeProperty); } else { return true; } From 4c3708c7fcab8e3856afb8348a8d3629eb26510d Mon Sep 17 00:00:00 2001 From: Sebastian Willenbrink Date: Wed, 14 Sep 2022 09:29:59 +0200 Subject: [PATCH 2/2] Add include string for clang support --- include/inviwo/core/resourcemanager/resourcemanagerobserver.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/inviwo/core/resourcemanager/resourcemanagerobserver.h b/include/inviwo/core/resourcemanager/resourcemanagerobserver.h index 5a581a79ebe..7a139965db5 100644 --- a/include/inviwo/core/resourcemanager/resourcemanagerobserver.h +++ b/include/inviwo/core/resourcemanager/resourcemanagerobserver.h @@ -29,6 +29,7 @@ #pragma once +#include #include #include