gnucash master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Fri Nov 18 17:31:06 EST 2016


Updated	 via  https://github.com/Gnucash/gnucash/commit/a7225780 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f6a0e20a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/fff486c2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/05049676 (commit)
	from  https://github.com/Gnucash/gnucash/commit/105ec1e4 (commit)



commit a7225780d635191d97321202b79cf8d49a93e349
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Nov 18 14:26:34 2016 -0800

    Add brackets around array instantion inside initializer list.
    
    See https://llvm.org/bugs/show_bug.cgi?id=21629 and
    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25137 for the excrutiating
    details. Seems easier to just do what the compiler wants than to screw
    around with pragmas or disabling the warning.

diff --git a/src/libqof/qof/guid.cpp b/src/libqof/qof/guid.cpp
index b3a33b8..85eab23 100644
--- a/src/libqof/qof/guid.cpp
+++ b/src/libqof/qof/guid.cpp
@@ -362,14 +362,14 @@ guid_syntax_exception::guid_syntax_exception () noexcept
 }
 
 GUID::GUID (GncGUID const & other) noexcept
-    : implementation {other.reserved[0] , other.reserved[1]
-         , other.reserved[2], other.reserved[3]
-         , other.reserved[4], other.reserved[5]
-         , other.reserved[6], other.reserved[7]
-         , other.reserved[8], other.reserved[9]
-         , other.reserved[10], other.reserved[11]
-         , other.reserved[12], other.reserved[13]
-         , other.reserved[14], other.reserved[15]
+: implementation {{other.reserved[0] , other.reserved[1]
+            , other.reserved[2], other.reserved[3]
+            , other.reserved[4], other.reserved[5]
+            , other.reserved[6], other.reserved[7]
+            , other.reserved[8], other.reserved[9]
+            , other.reserved[10], other.reserved[11]
+            , other.reserved[12], other.reserved[13]
+            , other.reserved[14], other.reserved[15]}
     }
 {
 

commit f6a0e20aedf439bb57eb8fcd31e0cda81446fe25
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Nov 18 14:25:23 2016 -0800

    Remove EXTRA_DIST reference to as-scrub-includes.m4.
    
    File itself was removed in b905c4a.

diff --git a/Makefile.am b/Makefile.am
index 00baca8..0e507e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,6 @@ dist_doc_DATA = \
 EXTRA_DIST = \
   $(SWIG_DIST_FAIL) \
   make-gnucash-potfiles.in \
-  macros/as-scrub-include.m4 \
   macros/binreloc.m4 \
   macros/compiler-flags.m4 \
   macros/ax_pkg_swig.m4 \

commit fff486c208655301dd1f103aeae3b78cee2a66ee
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Nov 18 14:23:29 2016 -0800

    Remove std::move call that defeats RVO.

diff --git a/src/backend/dbi/gnc-dbisqlconnection.cpp b/src/backend/dbi/gnc-dbisqlconnection.cpp
index c785ac8..8731bdb 100644
--- a/src/backend/dbi/gnc-dbisqlconnection.cpp
+++ b/src/backend/dbi/gnc-dbisqlconnection.cpp
@@ -76,11 +76,11 @@ GncDbiSqlStatement::add_where_cond(QofIdTypeConst type_name,
 GncDbiSqlConnection::GncDbiSqlConnection (DbType type, QofBackend* qbe,
                                           dbi_conn conn, bool ignore_lock) :
     m_qbe{qbe}, m_conn{conn},
-    m_provider{std::move(type == DbType::DBI_SQLITE ?
-                         make_dbi_provider<DbType::DBI_SQLITE>() :
-                         type == DbType::DBI_MYSQL ?
-                         make_dbi_provider<DbType::DBI_MYSQL>() :
-                         make_dbi_provider<DbType::DBI_PGSQL>())},
+    m_provider{type == DbType::DBI_SQLITE ?
+            make_dbi_provider<DbType::DBI_SQLITE>() :
+            type == DbType::DBI_MYSQL ?
+            make_dbi_provider<DbType::DBI_MYSQL>() :
+            make_dbi_provider<DbType::DBI_PGSQL>()},
     m_conn_ok{true}, m_last_error{ERR_BACKEND_NO_ERR}, m_error_repeat{0},
     m_retry{false}
 {

commit 05049676cb4c9e2d9599712644f0f17dd7b034ba
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Nov 18 14:21:40 2016 -0800

    Sync POTFILES.in with files added and removed by c++-backend.

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 70ed0bd..0adb5c1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -39,10 +39,11 @@ src/app-utils/prefs.scm
 src/app-utils/QuickFill.c
 src/app-utils/simple-obj.scm
 src/backend/dbi/gnc-backend-dbi.cpp
+src/backend/dbi/gnc-dbisqlconnection.cpp
+src/backend/dbi/gnc-dbisqlresult.cpp
 src/backend/sql/escape.cpp
 src/backend/sql/gnc-account-sql.cpp
 src/backend/sql/gnc-address-sql.cpp
-src/backend/sql/gnc-backend-sql.cpp
 src/backend/sql/gnc-bill-term-sql.cpp
 src/backend/sql/gnc-book-sql.cpp
 src/backend/sql/gnc-budget-sql.cpp
@@ -59,6 +60,10 @@ src/backend/sql/gnc-price-sql.cpp
 src/backend/sql/gnc-recurrence-sql.cpp
 src/backend/sql/gnc-schedxaction-sql.cpp
 src/backend/sql/gnc-slots-sql.cpp
+src/backend/sql/gnc-sql-backend.cpp
+src/backend/sql/gnc-sql-column-table-entry.cpp
+src/backend/sql/gnc-sql-object-backend.cpp
+src/backend/sql/gnc-sql-result.cpp
 src/backend/sql/gnc-tax-table-sql.cpp
 src/backend/sql/gnc-transaction-sql.cpp
 src/backend/sql/gnc-vendor-sql.cpp
@@ -421,6 +426,7 @@ src/import-export/csv-imp/assistant-csv-trans-import.c
 src/import-export/csv-imp/assistant-csv-trans-import.glade
 src/import-export/csv-imp/csv-account-import.c
 src/import-export/csv-imp/csv-fixed-trans-import.c
+src/import-export/csv-imp/gnc-csv-account-map.c
 src/import-export/csv-imp/gnc-csv-gnumeric-popup.c
 src/import-export/csv-imp/gnc-csv-model.c
 src/import-export/csv-imp/gnc-csv-trans-settings.c



Summary of changes:
 Makefile.am                              |  1 -
 po/POTFILES.in                           |  8 +++++++-
 src/backend/dbi/gnc-dbisqlconnection.cpp | 10 +++++-----
 src/libqof/qof/guid.cpp                  | 16 ++++++++--------
 4 files changed, 20 insertions(+), 15 deletions(-)



More information about the gnucash-changes mailing list