From eae57d9aab66511a22a869192b7ec72feeaedc7a Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Tue, 14 Jul 2026 20:25:54 +0200 Subject: [PATCH] Fix clang-tidy modernize-avoid-bind check And enable the check in the config. Signed-off-by: Ralph Sennhauser --- source/tools/atlas/AtlasUI/General/Observable.h | 6 +++--- source/tools/lint/clang-tidy/config.yml | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/source/tools/atlas/AtlasUI/General/Observable.h b/source/tools/atlas/AtlasUI/General/Observable.h index 8ae2b9f2f5..09b898491d 100644 --- a/source/tools/atlas/AtlasUI/General/Observable.h +++ b/source/tools/atlas/AtlasUI/General/Observable.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2025 Wildfire Games. +/* Copyright (C) 2026 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -61,7 +61,7 @@ public: template ObservableConnection RegisterObserver(int order, void (C::*callback) (const T&), C* obj) { - return m_Signal.connect(order, std::bind(std::mem_fn(callback), obj, std::placeholders::_1)); + return m_Signal.connect(order, std::bind_front(callback, obj)); } ObservableConnection RegisterObserver(int order, void (*callback) (const T&)) @@ -133,7 +133,7 @@ public: template ObservableConnection RegisterObserver(int order, void (C::*callback) (T*), C* obj) { - return m_Signal.connect(order, std::bind(std::mem_fn(callback), obj, std::placeholders::_1)); + return m_Signal.connect(order, std::bind_front(callback, obj)); } ObservableConnection RegisterObserver(int order, void (*callback) (T*)) diff --git a/source/tools/lint/clang-tidy/config.yml b/source/tools/lint/clang-tidy/config.yml index 0864e3435f..6ecacafafb 100644 --- a/source/tools/lint/clang-tidy/config.yml +++ b/source/tools/lint/clang-tidy/config.yml @@ -82,7 +82,6 @@ Checks: - -cppcoreguidelines-use-enum-class - -cppcoreguidelines-virtual-class-destructor - modernize-* - - -modernize-avoid-bind - -modernize-avoid-c-arrays - -modernize-avoid-c-style-cast - -modernize-avoid-setjmp-longjmp