From daf2d9202ff958f696b46fe74d771fc36bda1a63 Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Thu, 18 Jul 2024 10:22:22 -0400 Subject: [PATCH 1/3] Remove `` in quarterly constructors They are disallowed here in C++20, which is enforced by new versions of gcc (14.1.0 and up) --- src/quarterly.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/quarterly.h b/src/quarterly.h index f7bc832a..6d9d2896 100644 --- a/src/quarterly.h +++ b/src/quarterly.h @@ -200,8 +200,8 @@ class year short y_; public: - year() = default; - explicit CONSTCD11 year(int y) NOEXCEPT; + year() = default; + explicit CONSTCD11 year(int y) NOEXCEPT; CONSTCD14 year& operator++() NOEXCEPT; CONSTCD14 year operator++(int) NOEXCEPT; @@ -255,9 +255,9 @@ class year_quarternum quarterly::quarternum qn_; public: - year_quarternum() = default; - CONSTCD11 year_quarternum(const quarterly::year& y, - const quarterly::quarternum& qn) NOEXCEPT; + year_quarternum() = default; + CONSTCD11 year_quarternum(const quarterly::year& y, + const quarterly::quarternum& qn) NOEXCEPT; CONSTCD11 quarterly::year year() const NOEXCEPT; CONSTCD11 quarterly::quarternum quarternum() const NOEXCEPT; @@ -368,10 +368,10 @@ class year_quarternum_quarterday_last quarterly::quarternum qn_; public: - year_quarternum_quarterday_last() = default; - CONSTCD11 year_quarternum_quarterday_last(const quarterly::year& y, - const quarterly::quarternum& qn) NOEXCEPT; - CONSTCD11 year_quarternum_quarterday_last(const quarterly::year_quarternum& yqn) NOEXCEPT; + year_quarternum_quarterday_last() = default; + CONSTCD11 year_quarternum_quarterday_last(const quarterly::year& y, + const quarterly::quarternum& qn) NOEXCEPT; + CONSTCD11 year_quarternum_quarterday_last(const quarterly::year_quarternum& yqn) NOEXCEPT; CONSTCD14 year_quarternum_quarterday_last& operator+=(const quarters& dq) NOEXCEPT; CONSTCD14 year_quarternum_quarterday_last& operator-=(const quarters& dq) NOEXCEPT; @@ -429,15 +429,15 @@ class year_quarternum_quarterday quarterly::quarterday qd_; public: - year_quarternum_quarterday() = default; - CONSTCD11 year_quarternum_quarterday(const quarterly::year& y, - const quarterly::quarternum& qn, - const quarterly::quarterday& qd) NOEXCEPT; - CONSTCD11 year_quarternum_quarterday(const quarterly::year_quarternum& yqn, - const quarterly::quarterday& qd) NOEXCEPT; - CONSTCD14 year_quarternum_quarterday(const year_quarternum_quarterday_last& yqnqdl) NOEXCEPT; - CONSTCD14 year_quarternum_quarterday(const sys_days& dp) NOEXCEPT; - CONSTCD14 year_quarternum_quarterday(const local_days& dp) NOEXCEPT; + year_quarternum_quarterday() = default; + CONSTCD11 year_quarternum_quarterday(const quarterly::year& y, + const quarterly::quarternum& qn, + const quarterly::quarterday& qd) NOEXCEPT; + CONSTCD11 year_quarternum_quarterday(const quarterly::year_quarternum& yqn, + const quarterly::quarterday& qd) NOEXCEPT; + CONSTCD14 year_quarternum_quarterday(const year_quarternum_quarterday_last& yqnqdl) NOEXCEPT; + CONSTCD14 year_quarternum_quarterday(const sys_days& dp) NOEXCEPT; + CONSTCD14 year_quarternum_quarterday(const local_days& dp) NOEXCEPT; CONSTCD14 year_quarternum_quarterday& operator+=(const quarters& dq) NOEXCEPT; CONSTCD14 year_quarternum_quarterday& operator-=(const quarters& dq) NOEXCEPT; From 09262f6d5b9bcc0aeb3919b98aafa780e6f4bffd Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Thu, 18 Jul 2024 10:29:22 -0400 Subject: [PATCH 2/3] NEWS bullet --- NEWS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.md b/NEWS.md index 0b36d871..55d3fdfb 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,7 @@ # clock (development version) +* Fixed a gcc warning reported by CRAN related to templated C++ constructors (#371). + # clock 0.7.0 ## New features From 07d56d7a441cdf1b9f7ac1008043988c5056353f Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Thu, 18 Jul 2024 10:30:23 -0400 Subject: [PATCH 3/3] Tweak --- NEWS.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 55d3fdfb..8d653c79 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,7 @@ # clock (development version) -* Fixed a gcc warning reported by CRAN related to templated C++ constructors (#371). +* Fixed a gcc warning reported by CRAN related to templated C++ constructors + (#371). # clock 0.7.0