From c92be2965c8c8f36aed1cf86d8e44915855b4806 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Fri, 27 Mar 2020 18:30:35 +0200 Subject: [core] Fix misc-unconventional-assign-operator errors in header files As reported by clang-tidy-8. --- src/mbgl/gl/state.hpp | 4 +++- src/mbgl/gl/uniform.hpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mbgl/gl/state.hpp b/src/mbgl/gl/state.hpp index 17503cc043..77effb1781 100644 --- a/src/mbgl/gl/state.hpp +++ b/src/mbgl/gl/state.hpp @@ -20,11 +20,13 @@ public: State(Args&&... args) : params(std::forward_as_tuple(::std::forward(args)...)) { } - void operator=(const typename T::Type& value) { + State& operator=(const typename T::Type& value) { if (*this != value) { setCurrentValue(value); set(std::index_sequence_for{}); } + + return *this; } bool operator==(const typename T::Type& value) const { diff --git a/src/mbgl/gl/uniform.hpp b/src/mbgl/gl/uniform.hpp index 9f752de8af..6714379217 100644 --- a/src/mbgl/gl/uniform.hpp +++ b/src/mbgl/gl/uniform.hpp @@ -39,11 +39,13 @@ class UniformState { public: UniformState(UniformLocation location_ = -1) : location(location_) {} - void operator=(const Value& value) { + UniformState& operator=(const Value& value) { if (location >= 0 && (!current || *current != value)) { current = value; bindUniform(location, value); } + + return *this; } UniformLocation location; -- cgit v1.2.1