On Thursday 09 June 2016 18:42:28 John Ralls wrote: > Updated via https://github.com/Gnucash/gnucash/commit/2bbc1a19 > (commit) via https://github.com/Gnucash/gnucash/commit/949ff816 > (commit) via https://github.com/Gnucash/gnucash/commit/ce190e34 > (commit) via https://github.com/Gnucash/gnucash/commit/1c00937a > (commit) via https://github.com/Gnucash/gnucash/commit/293a2866 > (commit) via https://github.com/Gnucash/gnucash/commit/74800e18 > (commit) via https://github.com/Gnucash/gnucash/commit/0ee7e61b > (commit) via https://github.com/Gnucash/gnucash/commit/3063c873 > (commit) via https://github.com/Gnucash/gnucash/commit/557a5e2f > (commit) via https://github.com/Gnucash/gnucash/commit/33908860 > (commit) from https://github.com/Gnucash/gnucash/commit/9f3dc0c8 > (commit) > > > > commit 2bbc1a193d582a6f1a9b7a95391485af09fd3e6a > Merge: 949ff81 ce190e3 > Author: John Ralls <jra...@ceridwen.us> > Date: Thu Jun 9 15:29:45 2016 -0700 > > Merge branch 'guid_header' >
After I rebase a local c++ branch on top of master with the guid_header branch merged it, I'm getting compile errors. A snippet from the build log: In file included from /kobaltnet/janssege/Development/gnucash/gnucash- master/src/libqof/qof/qofid.h:82:0, from /kobaltnet/janssege/Development/gnucash/gnucash-master/src/libqof/qof/qof.h:72, from /kobaltnet/janssege/Development/gnucash/gnucash- master/src/engine/Account.h:47, from /kobaltnet/janssege/Development/gnucash/gnucash-master/src/import-export/csv-imp/gnc-csv- account-map.h:31, from /kobaltnet/janssege/Development/gnucash/gnucash- master/src/import-export/csv-imp/gnc-csv-imp-trans.cpp:31: /kobaltnet/janssege/Development/gnucash/gnucash-master/src/libqof/qof/guid.h:76:7: error: ‘GncGUID’ does not name a type const GncGUID* gnc_value_get_guid (const GValue *value); ^ In file included from /kobaltnet/janssege/Development/gnucash/gnucash- master/src/libqof/qof/qofid.h:82:0, from /kobaltnet/janssege/Development/gnucash/gnucash-master/src/libqof/qof/qof.h:72, from /kobaltnet/janssege/Development/gnucash/gnucash- master/src/engine/Account.h:47, from /kobaltnet/janssege/Development/gnucash/gnucash-master/src/import-export/csv-imp/gnc-csv- account-map.h:31, from /kobaltnet/janssege/Development/gnucash/gnucash- master/src/import-export/csv-imp/gnc-csv-imp-trans.cpp:31: /kobaltnet/janssege/Development/gnucash/gnucash-master/src/libqof/qof/guid.h:87:20: error: variable or field ‘guid_replace’ declared void void guid_replace (GncGUID *guid); ^ /kobaltnet/janssege/Development/gnucash/gnucash-master/src/libqof/qof/guid.h:87:20: error: ‘GncGUID’ was not declared inthis scope /kobaltnet/janssege/Development/gnucash/gnucash- master/src/libqof/qof/guid.h:87:29: error: ‘guid’ was not declared in this scope void guid_replace (GncGUID *guid); ^ /kobaltnet/janssege/Development/gnucash/gnucash-master/src/libqof/qof/guid.h:93:1: error: ‘GncGUID’ does not name a type GncGUID guid_new_return (void); ^ /kobaltnet/janssege/Development/gnucash/gnucash-master/src/libqof/qof/guid.h:98:7: error: ‘GncGUID’ does not name a type const GncGUID * guid_null (void); I'm not using guid's in my code. These errors are pulled in because of the Account.h header that gets included somewhere. I saw one commit on the guid_header branch is including guid.hpp everywhere. Is that what I now have to do in my sources even if I'm not using a guid directly ? Or what is the correct approach here ? Regards, Geert _______________________________________________ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel