gnucash master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Sun Jan 8 19:15:56 EST 2023


Updated	 via  https://github.com/Gnucash/gnucash/commit/3231185a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/fed4daf4 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/61673ec9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/d4a1fb92 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f96f8f40 (commit)
	from  https://github.com/Gnucash/gnucash/commit/de847278 (commit)



commit 3231185a51cb3b473a751e2b71976a2a2b98de73
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Jan 8 16:15:06 2023 -0800

    [c++ quotes] std::setw requires include <iomanip>.

commit fed4daf4e7dea7c85a56ad08f1817319272f7567
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Jan 8 16:11:58 2023 -0800

    [c++ quotes] Make sure to include all of the required Boost libraries.
    
    Also Boost-iostreams needs winsock but doesn't tell Cmake, so explicitly
    add it to the link list.

commit 61673ec919d4739b395cc0904f8b920095e3e97f
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Jan 8 16:09:32 2023 -0800

    [c++ options] Rearrange header includes to avoid windows.h conflicts.
    
    Since SWIG guile pulls in libguile early the options headers must
    be included in a begin block.

commit d4a1fb92a6a23556a87b9308adbb94049c7ab748
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Jan 8 16:08:04 2023 -0800

    [c++ options] strptime.h must be included as extern "C".

commit f96f8f40430b73bdd91b70207653e7fb94229677
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Jan 8 16:04:27 2023 -0800

    [c++options] Reorder include directives to fix Windows biuld.
    
    libguile.h includes windows.h and doing so breaks including c++ headers
    after that use advanced features like enum class. Ensure that the
    gnc-option headers are included before libguile.h.



Summary of changes:
 CMakeLists.txt                              |  2 +-
 bindings/engine.i                           |  2 --
 bindings/guile/gnc-engine-guile.cpp         |  2 +-
 bindings/guile/gnc-optiondb.i               | 24 +++++++++++++++++++-----
 gnucash/gnome-utils/dialog-options.cpp      |  8 ++++----
 gnucash/gnome-utils/dialog-options.hpp      |  2 ++
 gnucash/gnome-utils/gnc-main-window.cpp     |  4 ++--
 gnucash/gnome-utils/gnc-option-gtk-ui.cpp   | 10 +++++++++-
 gnucash/gnome-utils/gnc-option-gtk-ui.hpp   |  2 +-
 gnucash/gnome/assistant-hierarchy.cpp       |  6 +++---
 gnucash/gnome/dialog-report-column-view.cpp |  6 +++---
 gnucash/gnome/dialog-report-style-sheet.cpp |  6 +++---
 gnucash/gnome/gnc-plugin-page-report.cpp    |  4 ++--
 gnucash/gnome/window-report.cpp             |  6 +++---
 gnucash/gnucash-commands.cpp                |  1 +
 gnucash/report/gnc-report.cpp               |  1 +
 gnucash/report/gnc-report.h                 |  1 -
 libgnucash/app-utils/CMakeLists.txt         |  2 +-
 18 files changed, 56 insertions(+), 33 deletions(-)



More information about the gnucash-patches mailing list