gnucash master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/2270b851 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/592c3ad5 (commit)
	from  https://github.com/Gnucash/gnucash/commit/3ca8fa12 (commit)



commit 2270b851ba693f1bd6f286b4f0244d3a250eff55
Merge: 3ca8fa122 592c3ad56
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Apr 14 11:24:37 2020 -0700

    Merge Jeff Law's 'lto-fix' into master.


commit 592c3ad562c0c269d0f9260dbe329e2e3faadfe7
Author: Bill Nottingham <notting at splat.cc>
Date:   Mon Apr 13 22:12:45 2020 -0400

    Fix building with link-time-optimization.
    
    Patch from Jeff Law (law at redhat.com):
    Rename one instance of struct _iterate to struct _qofid_iterate to
    avoid ODR problems with LTO

diff --git a/libgnucash/engine/qofid.cpp b/libgnucash/engine/qofid.cpp
index 1f50e95fc..7f713c66f 100644
--- a/libgnucash/engine/qofid.cpp
+++ b/libgnucash/engine/qofid.cpp
@@ -303,7 +303,7 @@ qof_collection_set_data (QofCollection *col, gpointer user_data)
 
 /* =============================================================== */
 
-struct _iterate
+struct _qofid_iterate
 {
     QofInstanceForeachCB      fcn;
     gpointer                data;
@@ -312,7 +312,7 @@ struct _iterate
 static void
 foreach_cb (gpointer item, gpointer arg)
 {
-    struct _iterate *iter = static_cast<_iterate*>(arg);
+    struct _qofid_iterate *iter = static_cast<_qofid_iterate*>(arg);
     QofInstance *ent = static_cast<QofInstance*>(item);
 
     iter->fcn (ent, iter->data);
@@ -322,7 +322,7 @@ void
 qof_collection_foreach (const QofCollection *col, QofInstanceForeachCB cb_func,
                         gpointer user_data)
 {
-    struct _iterate iter;
+    struct _qofid_iterate iter;
     GList *entries;
 
     g_return_if_fail (col);



Summary of changes:
 libgnucash/engine/qofid.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)