Skip to content

Remove <S> in quarterly constructors #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 18, 2024
Merged

Remove <S> in quarterly constructors #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
daf2d92
Remove `<S>` in quarterly constructors
DavisVaughan Jul 18, 2024
09262f6
NEWS bullet
DavisVaughan Jul 18, 2024
07d56d7
Tweak
DavisVaughan Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# clock (development version)

* Fixed a gcc warning reported by CRAN related to templated C++ constructors
(#371).

# clock 0.7.0

## New features
Expand Down
36 changes: 18 additions & 18 deletions src/quarterly.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ class year
short y_;

public:
year<S>() = default;
explicit CONSTCD11 year<S>(int y) NOEXCEPT;
year() = default;
explicit CONSTCD11 year(int y) NOEXCEPT;

CONSTCD14 year<S>& operator++() NOEXCEPT;
CONSTCD14 year<S> operator++(int) NOEXCEPT;
Expand Down Expand Up @@ -255,9 +255,9 @@ class year_quarternum
quarterly::quarternum qn_;

public:
year_quarternum<S>() = default;
CONSTCD11 year_quarternum<S>(const quarterly::year<S>& y,
const quarterly::quarternum& qn) NOEXCEPT;
year_quarternum() = default;
CONSTCD11 year_quarternum(const quarterly::year<S>& y,
const quarterly::quarternum& qn) NOEXCEPT;

CONSTCD11 quarterly::year<S> year() const NOEXCEPT;
CONSTCD11 quarterly::quarternum quarternum() const NOEXCEPT;
Expand Down Expand Up @@ -368,10 +368,10 @@ class year_quarternum_quarterday_last
quarterly::quarternum qn_;

public:
year_quarternum_quarterday_last<S>() = default;
CONSTCD11 year_quarternum_quarterday_last<S>(const quarterly::year<S>& y,
const quarterly::quarternum& qn) NOEXCEPT;
CONSTCD11 year_quarternum_quarterday_last<S>(const quarterly::year_quarternum<S>& yqn) NOEXCEPT;
year_quarternum_quarterday_last() = default;
CONSTCD11 year_quarternum_quarterday_last(const quarterly::year<S>& y,
const quarterly::quarternum& qn) NOEXCEPT;
CONSTCD11 year_quarternum_quarterday_last(const quarterly::year_quarternum<S>& yqn) NOEXCEPT;

CONSTCD14 year_quarternum_quarterday_last<S>& operator+=(const quarters& dq) NOEXCEPT;
CONSTCD14 year_quarternum_quarterday_last<S>& operator-=(const quarters& dq) NOEXCEPT;
Expand Down Expand Up @@ -429,15 +429,15 @@ class year_quarternum_quarterday
quarterly::quarterday qd_;

public:
year_quarternum_quarterday<S>() = default;
CONSTCD11 year_quarternum_quarterday<S>(const quarterly::year<S>& y,
const quarterly::quarternum& qn,
const quarterly::quarterday& qd) NOEXCEPT;
CONSTCD11 year_quarternum_quarterday<S>(const quarterly::year_quarternum<S>& yqn,
const quarterly::quarterday& qd) NOEXCEPT;
CONSTCD14 year_quarternum_quarterday<S>(const year_quarternum_quarterday_last<S>& yqnqdl) NOEXCEPT;
CONSTCD14 year_quarternum_quarterday<S>(const sys_days& dp) NOEXCEPT;
CONSTCD14 year_quarternum_quarterday<S>(const local_days& dp) NOEXCEPT;
year_quarternum_quarterday() = default;
CONSTCD11 year_quarternum_quarterday(const quarterly::year<S>& y,
const quarterly::quarternum& qn,
const quarterly::quarterday& qd) NOEXCEPT;
CONSTCD11 year_quarternum_quarterday(const quarterly::year_quarternum<S>& yqn,
const quarterly::quarterday& qd) NOEXCEPT;
CONSTCD14 year_quarternum_quarterday(const year_quarternum_quarterday_last<S>& yqnqdl) NOEXCEPT;
CONSTCD14 year_quarternum_quarterday(const sys_days& dp) NOEXCEPT;
CONSTCD14 year_quarternum_quarterday(const local_days& dp) NOEXCEPT;

CONSTCD14 year_quarternum_quarterday<S>& operator+=(const quarters& dq) NOEXCEPT;
CONSTCD14 year_quarternum_quarterday<S>& operator-=(const quarters& dq) NOEXCEPT;
Expand Down