summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjell Ahlstedt <kjellahlstedt@gmail.com>2023-01-09 09:35:02 +0000
committerKjell Ahlstedt <kjellahlstedt@gmail.com>2023-01-09 09:35:02 +0000
commite192ac99ebf261b5d5a8b199bc658ed3146996ae (patch)
tree52655cde0e52f1d924c32a51b59f11200a90fda8
parentd7b071ae938c2c53047e2359fbc6665c5eae6ff6 (diff)
parent52b379e0a814f35a5f3f2bcfc259abb3ed1c0473 (diff)
downloadglibmm-e192ac99ebf261b5d5a8b199bc658ed3146996ae.tar.gz
Merge branch 'fix-msvc-warnings-max' into 'master'
liststore.hg: Rename a local variable (fix `-Dwarnings=max` on Visual Studio) See merge request GNOME/glibmm!59
-rw-r--r--gio/src/liststore.hg4
1 files 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<bool, unsigned int> ListStore<T_item>::find(
auto slot_ptr = const_cast<SlotEqual*>(&slot);
unsigned int position = std::numeric_limits<unsigned int>::max();
- bool result = g_list_store_find_with_equal_func_full(
+ bool find_result = g_list_store_find_with_equal_func_full(
const_cast<GListStore*>(gobj()), const_cast<typename T_item::BaseObjectType*>(item->gobj()),
&equal_func_full, slot_ptr, &position);
- return {result, position};
+ return {find_result, position};
}
template <typename T_item>