From 52b379e0a814f35a5f3f2bcfc259abb3ed1c0473 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 9 Jan 2023 10:32:47 +0800 Subject: liststore.hg: Rename a local variable In the templatized implementation of std::pair ListStore::find, replace 'result' with 'find_result' for what g_list_store_find_with_equal_func_full() returns, to avoid a compiler warning when building the giomm_listmodel test program when '-Dwarnings=max' is specified, for Visual Studio builds, as we are using a variable 'result' in a rather global scrope there[1]. This will help fix 'meson dist' on Visual Studio builds. [1]: https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-4-c4459 --- gio/src/liststore.hg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gio/src/liststore.hg b/gio/src/liststore.hg index 58b51997..07fe0257 100644 --- a/gio/src/liststore.hg +++ b/gio/src/liststore.hg @@ -412,10 +412,10 @@ std::pair ListStore::find( auto slot_ptr = const_cast(&slot); unsigned int position = std::numeric_limits::max(); - bool result = g_list_store_find_with_equal_func_full( + bool find_result = g_list_store_find_with_equal_func_full( const_cast(gobj()), const_cast(item->gobj()), &equal_func_full, slot_ptr, &position); - return {result, position}; + return {find_result, position}; } template -- cgit v1.2.1