From 434dd9520c1c74c38dae8a737b2045ee28adc1e1 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 3 Apr 2018 22:02:44 -0400 Subject: [PATCH] Adjust catch syntax to avoid GCC8 warnings. --- libgnucash/backend/sql/gnc-address-sql.cpp | 2 +- libgnucash/backend/sql/gnc-owner-sql.cpp | 2 +- libgnucash/backend/sql/gnc-slots-sql.cpp | 2 +- .../sql/gnc-sql-column-table-entry.cpp | 24 +++++++++---------- .../sql/gnc-sql-column-table-entry.hpp | 2 +- .../backend/sql/gnc-transaction-sql.cpp | 2 +- libgnucash/engine/Account.cpp | 2 +- libgnucash/engine/gnc-date.cpp | 8 +++---- libgnucash/engine/gnc-datetime.cpp | 12 +++++----- libgnucash/engine/gnc-rational.cpp | 2 +- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/libgnucash/backend/sql/gnc-address-sql.cpp b/libgnucash/backend/sql/gnc-address-sql.cpp index 4445befe47..e3c18ca9bc 100644 --- a/libgnucash/backend/sql/gnc-address-sql.cpp +++ b/libgnucash/backend/sql/gnc-address-sql.cpp @@ -98,7 +98,7 @@ GncSqlColumnTableEntryImpl::load (const GncSqlBackend* sql_be, set_parameter (addr, val.c_str(), sub_setter, subtable_row->m_gobj_param_name); } - catch (std::invalid_argument) + catch (std::invalid_argument&) { return; } diff --git a/libgnucash/backend/sql/gnc-owner-sql.cpp b/libgnucash/backend/sql/gnc-owner-sql.cpp index 2e862b2cbc..c2f2990881 100644 --- a/libgnucash/backend/sql/gnc-owner-sql.cpp +++ b/libgnucash/backend/sql/gnc-owner-sql.cpp @@ -73,7 +73,7 @@ GncSqlColumnTableEntryImpl::load (const GncSqlBackend* sql_be, if (string_to_guid (val.c_str(), &guid)) pGuid = &guid; } - catch (std::invalid_argument) + catch (std::invalid_argument&) { return; } diff --git a/libgnucash/backend/sql/gnc-slots-sql.cpp b/libgnucash/backend/sql/gnc-slots-sql.cpp index 7f579c13af..ca26617347 100644 --- a/libgnucash/backend/sql/gnc-slots-sql.cpp +++ b/libgnucash/backend/sql/gnc-slots-sql.cpp @@ -703,7 +703,7 @@ gnc_sql_slots_delete (GncSqlBackend* sql_be, const GncGUID* guid) if (string_to_guid (val.c_str(), &child_guid)) gnc_sql_slots_delete (sql_be, &child_guid); } - catch (std::invalid_argument) + catch (std::invalid_argument&) { continue; } diff --git a/libgnucash/backend/sql/gnc-sql-column-table-entry.cpp b/libgnucash/backend/sql/gnc-sql-column-table-entry.cpp index 09d6f3a6ac..81e193882e 100644 --- a/libgnucash/backend/sql/gnc-sql-column-table-entry.cpp +++ b/libgnucash/backend/sql/gnc-sql-column-table-entry.cpp @@ -130,7 +130,7 @@ GncSqlColumnTableEntryImpl::load (const GncSqlBackend* sql_be, auto s = row.get_string_at_col (m_col_name); set_parameter(pObject, s.c_str(), get_setter(obj_name), m_gobj_param_name); } - catch (std::invalid_argument) {} + catch (std::invalid_argument&) {} } template<> void @@ -279,19 +279,19 @@ GncSqlColumnTableEntryImpl::load (const GncSqlBackend* sql_be, { val = static_cast(row.get_int_at_col(m_col_name)); } - catch (std::invalid_argument) + catch (std::invalid_argument&) { try { val = static_cast(row.get_float_at_col(m_col_name)); } - catch (std::invalid_argument) + catch (std::invalid_argument&) { try { val = row.get_double_at_col(m_col_name); } - catch (std::invalid_argument) + catch (std::invalid_argument&) { val = 0.0; } @@ -336,7 +336,7 @@ GncSqlColumnTableEntryImpl::load (const GncSqlBackend* sql_be, { str = row.get_string_at_col(m_col_name); } - catch (std::invalid_argument) + catch (std::invalid_argument&) { return; } @@ -391,7 +391,7 @@ GncSqlColumnTableEntryImpl::load (const GncSqlBackend* sql_be, auto val = row.get_time64_at_col(m_col_name); timespecFromTime64 (&ts, val); } - catch (std::invalid_argument) + catch (std::invalid_argument&) { try { @@ -399,7 +399,7 @@ GncSqlColumnTableEntryImpl::load (const GncSqlBackend* sql_be, GncDateTime time(val); ts.tv_sec = static_cast(time); } - catch (std::invalid_argument) + catch (std::invalid_argument&) { return; } @@ -471,7 +471,7 @@ GncSqlColumnTableEntryImpl::load (const GncSqlBackend* sql_be, { t = row.get_time64_at_col (m_col_name); } - catch (std::invalid_argument) + catch (std::invalid_argument&) { try { @@ -479,7 +479,7 @@ GncSqlColumnTableEntryImpl::load (const GncSqlBackend* sql_be, GncDateTime time(val); t = static_cast(time); } - catch (std::invalid_argument) + catch (std::invalid_argument&) { return; } @@ -543,7 +543,7 @@ GncSqlColumnTableEntryImpl::load (const GncSqlBackend* sql_be, tm->tm_year + 1900); free(tm); } - catch (std::invalid_argument) + catch (std::invalid_argument&) { try { @@ -557,7 +557,7 @@ GncSqlColumnTableEntryImpl::load (const GncSqlBackend* sql_be, g_date_set_dmy(&date, day, month, year); } - catch (std::invalid_argument) + catch (std::invalid_argument&) { return; } @@ -622,7 +622,7 @@ GncSqlColumnTableEntryImpl::load (const GncSqlBackend* sql_be, n = gnc_numeric_create (num, denom); g_free (buf); } - catch (std::invalid_argument) + catch (std::invalid_argument&) { return; } diff --git a/libgnucash/backend/sql/gnc-sql-column-table-entry.hpp b/libgnucash/backend/sql/gnc-sql-column-table-entry.hpp index a98801aceb..0465589802 100644 --- a/libgnucash/backend/sql/gnc-sql-column-table-entry.hpp +++ b/libgnucash/backend/sql/gnc-sql-column-table-entry.hpp @@ -199,7 +199,7 @@ public: m_gobj_param_name); } } - catch (std::invalid_argument) {} + catch (std::invalid_argument&) {} } diff --git a/libgnucash/backend/sql/gnc-transaction-sql.cpp b/libgnucash/backend/sql/gnc-transaction-sql.cpp index 266d35657d..c8ddd1e70c 100644 --- a/libgnucash/backend/sql/gnc-transaction-sql.cpp +++ b/libgnucash/backend/sql/gnc-transaction-sql.cpp @@ -1326,7 +1326,7 @@ GncSqlColumnTableEntryImpl::load (const GncSqlBackend* sql_be, if (tx != nullptr) set_parameter (pObject, tx, get_setter(obj_name), m_gobj_param_name); } - catch (std::invalid_argument) {} + catch (std::invalid_argument&) {} } template<> void diff --git a/libgnucash/engine/Account.cpp b/libgnucash/engine/Account.cpp index 6f63fcb9ba..94078e7710 100644 --- a/libgnucash/engine/Account.cpp +++ b/libgnucash/engine/Account.cpp @@ -5442,7 +5442,7 @@ gnc_account_imap_find_account_bayes (GncImportMatchMap *imap, GList *tokens) gnc::GUID guid; try { guid = gnc::GUID::from_string(best.account_guid); - } catch (gnc::guid_syntax_exception) { + } catch (gnc::guid_syntax_exception&) { return nullptr; } auto account = xaccAccountLookup (reinterpret_cast(&guid), imap->book); diff --git a/libgnucash/engine/gnc-date.cpp b/libgnucash/engine/gnc-date.cpp index f4c0cf7f85..1b37ede086 100644 --- a/libgnucash/engine/gnc-date.cpp +++ b/libgnucash/engine/gnc-date.cpp @@ -120,7 +120,7 @@ gnc_localtime_r (const time64 *secs, struct tm* time) *time = static_cast(GncDateTime(*secs)); return time; } - catch(std::invalid_argument) + catch(std::invalid_argument&) { return NULL; } @@ -194,7 +194,7 @@ gnc_gmtime (const time64 *secs) *time = gncdt.utc_tm(); return time; } - catch(std::invalid_argument) + catch(std::invalid_argument&) { return NULL; } @@ -211,7 +211,7 @@ gnc_mktime (struct tm* time) *time = static_cast(gncdt); return static_cast(gncdt); } - catch(std::invalid_argument) + catch(std::invalid_argument&) { return 0; } @@ -232,7 +232,7 @@ gnc_timegm (struct tm* time) #endif return static_cast(gncdt) - gncdt.offset(); } - catch(std::invalid_argument) + catch(std::invalid_argument&) { return 0; } diff --git a/libgnucash/engine/gnc-datetime.cpp b/libgnucash/engine/gnc-datetime.cpp index e86d47e0da..6aa463c1f6 100644 --- a/libgnucash/engine/gnc-datetime.cpp +++ b/libgnucash/engine/gnc-datetime.cpp @@ -149,7 +149,7 @@ LDT_from_unix_local(const time64 time) auto tz = tzp.get(temp.date().year()); return LDT(temp, tz); } - catch(boost::gregorian::bad_year) + catch(boost::gregorian::bad_year&) { throw(std::invalid_argument("Time value is outside the supported year range.")); } @@ -167,15 +167,15 @@ LDT_from_struct_tm(const struct tm tm) LDT ldt(tdate, tdur, tz, LDTBase::EXCEPTION_ON_ERROR); return ldt; } - catch(boost::gregorian::bad_year) + catch(boost::gregorian::bad_year&) { throw(std::invalid_argument("Time value is outside the supported year range.")); } - catch(boost::local_time::time_label_invalid) + catch(boost::local_time::time_label_invalid&) { throw(std::invalid_argument("Struct tm does not resolve to a valid time.")); } - catch(boost::local_time::ambiguous_result) + catch(boost::local_time::ambiguous_result&) { throw(std::invalid_argument("Struct tm can resolve to more than one time.")); } @@ -256,7 +256,7 @@ GncDateTimeImpl::GncDateTimeImpl(const GncDateImpl& date, DayPart part) : m_time -= hours(offset.hours() - 11); } } - catch(boost::gregorian::bad_year) + catch(boost::gregorian::bad_year&) { throw(std::invalid_argument("Time value is outside the supported year range.")); } @@ -298,7 +298,7 @@ GncDateTimeImpl::GncDateTimeImpl(std::string str) : m_time = LDT(pdt.date(), pdt.time_of_day(), tzptr, LDTBase::NOT_DATE_TIME_ON_ERROR); } - catch(boost::gregorian::bad_year) + catch(boost::gregorian::bad_year&) { throw(std::invalid_argument("The date string was outside of the supported year range.")); } diff --git a/libgnucash/engine/gnc-rational.cpp b/libgnucash/engine/gnc-rational.cpp index c534b8b201..33f2741d67 100644 --- a/libgnucash/engine/gnc-rational.cpp +++ b/libgnucash/engine/gnc-rational.cpp @@ -69,7 +69,7 @@ GncRational::operator gnc_numeric () const noexcept { return {static_cast(m_num), static_cast(m_den)}; } - catch (std::overflow_error) + catch (std::overflow_error&) { return gnc_numeric_error (GNC_ERROR_OVERFLOW); }