feedc0de/date
1
0
Fork 0
forked from HowardHinnant/date
Code Pull Requests Activity

Merge pull request #1 from HowardHinnant/master

Browse Source 
Merged mainstream repo commits
This commit is contained in:
Ivan Pizhenko
2015-11-21 11:04:26 +02:00
parent bf699e573b c5f307fdb8
commit 21d042ef24
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
date.h
View File

@@ -738,9 +738,7 @@ operator-(const year_month_weekday_last& ymwdl, const years& dy) noexcept;
std::ostream& operator<<(std::ostream& os, const year_month_weekday_last& ymwdl); std::ostream& operator<<(std::ostream& os, const year_month_weekday_last& ymwdl);
} // namespace date inline namespace literals
inline namespace date_literals
{ {
CONSTCD11 date::day operator "" _d(unsigned long long d) noexcept; CONSTCD11 date::day operator "" _d(unsigned long long d) noexcept;
@@ -767,10 +765,7 @@ CONSTCD11 date::year operator "" _y(unsigned long long y) noexcept;
// CONSTDATA date::weekday fri{5u}; // CONSTDATA date::weekday fri{5u};
// CONSTDATA date::weekday sat{6u}; // CONSTDATA date::weekday sat{6u};
} // inline namespace date_literals } // inline namespace literals
namespace date
{
//----------------+ //----------------+
// Implementation | // Implementation |
@@ -1443,9 +1438,7 @@ operator<<(std::ostream& os, const weekday& wd)
return os; return os;
} }
} // namespace date inline namespace literals
inline namespace date_literals
{ {
CONSTDATA date::last_spec last{}; CONSTDATA date::last_spec last{};
@@ -1487,14 +1480,7 @@ CONSTDATA date::weekday thu{4u};
CONSTDATA date::weekday fri{5u}; CONSTDATA date::weekday fri{5u};
CONSTDATA date::weekday sat{6u}; CONSTDATA date::weekday sat{6u};
} // inline namespace date_literals } // inline namespace literals
namespace date
{
using namespace date_literals;
// weekday_indexed // weekday_indexed