zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-12-16 03:08:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: use brace-init list for raw memvars

Browse Source
This commit is contained in:
ToruNiina
2024-06-19 01:45:29 +09:00
parent 74bea5368a
commit 7cab13f6e5
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
include/toml11/fwd/datetime_fwd.hpp
View File

@@ -48,15 +48,15 @@ struct local_date
std::uint8_t day{0}; // [1, 31] std::uint8_t day{0}; // [1, 31]
local_date(int y, month_t m, int d) local_date(int y, month_t m, int d)
: year (static_cast<std::int16_t>(y)), : year {static_cast<std::int16_t>(y)},
month(static_cast<std::uint8_t>(m)), month{static_cast<std::uint8_t>(m)},
day (static_cast<std::uint8_t>(d)) day {static_cast<std::uint8_t>(d)}
{} {}
explicit local_date(const std::tm& t) explicit local_date(const std::tm& t)
: year (static_cast<std::int16_t>(t.tm_year + 1900)), : year {static_cast<std::int16_t>(t.tm_year + 1900)},
month(static_cast<std::uint8_t>(t.tm_mon)), month{static_cast<std::uint8_t>(t.tm_mon)},
day (static_cast<std::uint8_t>(t.tm_mday)) day {static_cast<std::uint8_t>(t.tm_mday)}
{} {}
explicit local_date(const std::chrono::system_clock::time_point& tp); explicit local_date(const std::chrono::system_clock::time_point& tp);
@@ -95,19 +95,19 @@ struct local_time
local_time(int h, int m, int s, local_time(int h, int m, int s,
int ms = 0, int us = 0, int ns = 0) int ms = 0, int us = 0, int ns = 0)
: hour (static_cast<std::uint8_t>(h)), : hour {static_cast<std::uint8_t>(h)},
minute(static_cast<std::uint8_t>(m)), minute{static_cast<std::uint8_t>(m)},
second(static_cast<std::uint8_t>(s)), second{static_cast<std::uint8_t>(s)},
millisecond(static_cast<std::uint16_t>(ms)), millisecond{static_cast<std::uint16_t>(ms)},
microsecond(static_cast<std::uint16_t>(us)), microsecond{static_cast<std::uint16_t>(us)},
nanosecond (static_cast<std::uint16_t>(ns)) nanosecond {static_cast<std::uint16_t>(ns)}
{} {}
explicit local_time(const std::tm& t) explicit local_time(const std::tm& t)
: hour (static_cast<std::uint8_t>(t.tm_hour)), : hour {static_cast<std::uint8_t>(t.tm_hour)},
minute(static_cast<std::uint8_t>(t.tm_min)), minute{static_cast<std::uint8_t>(t.tm_min )},
second(static_cast<std::uint8_t>(t.tm_sec)), second{static_cast<std::uint8_t>(t.tm_sec )},
millisecond(0), microsecond(0), nanosecond(0) millisecond{0}, microsecond{0}, nanosecond{0}
{} {}
template<typename Rep, typename Period> template<typename Rep, typename Period>
@@ -160,8 +160,8 @@ struct time_offset
std::int8_t minute{0}; // [-59, 59] std::int8_t minute{0}; // [-59, 59]
time_offset(int h, int m) time_offset(int h, int m)
: hour (static_cast<std::int8_t>(h)), : hour {static_cast<std::int8_t>(h)},
minute(static_cast<std::int8_t>(m)) minute{static_cast<std::int8_t>(m)}
{} {}
operator std::chrono::minutes() const; operator std::chrono::minutes() const;
@@ -192,9 +192,9 @@ struct local_datetime
local_date date{}; local_date date{};
local_time time{}; local_time time{};
local_datetime(local_date d, local_time t): date(d), time(t) {} local_datetime(local_date d, local_time t): date{d}, time{t} {}
explicit local_datetime(const std::tm& t): date(t), time(t){} explicit local_datetime(const std::tm& t): date{t}, time{t}{}
explicit local_datetime(const std::chrono::system_clock::time_point& tp); explicit local_datetime(const std::chrono::system_clock::time_point& tp);
explicit local_datetime(const std::time_t t); explicit local_datetime(const std::time_t t);
@@ -230,10 +230,10 @@ struct offset_datetime
time_offset offset{}; time_offset offset{};
offset_datetime(local_date d, local_time t, time_offset o) offset_datetime(local_date d, local_time t, time_offset o)
: date(d), time(t), offset(o) : date{d}, time{t}, offset{o}
{} {}
offset_datetime(const local_datetime& dt, time_offset o) offset_datetime(const local_datetime& dt, time_offset o)
: date(dt.date), time(dt.time), offset(o) : date{dt.date}, time{dt.time}, offset{o}
{} {}
// use the current local timezone offset // use the current local timezone offset
explicit offset_datetime(const local_datetime& ld); explicit offset_datetime(const local_datetime& ld);

12
include/toml11/impl/datetime_impl.hpp
View File

@@ -78,7 +78,7 @@ TOML11_INLINE local_date::local_date(const std::chrono::system_clock::time_point
} }
TOML11_INLINE local_date::local_date(const std::time_t t) TOML11_INLINE local_date::local_date(const std::time_t t)
: local_date(std::chrono::system_clock::from_time_t(t)) : local_date{std::chrono::system_clock::from_time_t(t)}
{} {}
TOML11_INLINE local_date::operator std::chrono::system_clock::time_point() const TOML11_INLINE local_date::operator std::chrono::system_clock::time_point() const
@@ -294,7 +294,7 @@ TOML11_INLINE local_datetime::local_datetime(const std::chrono::system_clock::ti
} }
TOML11_INLINE local_datetime::local_datetime(const std::time_t t) TOML11_INLINE local_datetime::local_datetime(const std::time_t t)
: local_datetime(std::chrono::system_clock::from_time_t(t)) : local_datetime{std::chrono::system_clock::from_time_t(t)}
{} {}
TOML11_INLINE local_datetime::operator std::chrono::system_clock::time_point() const TOML11_INLINE local_datetime::operator std::chrono::system_clock::time_point() const
@@ -380,11 +380,11 @@ TOML11_INLINE std::string to_string(const local_datetime& dt)
TOML11_INLINE offset_datetime::offset_datetime(const local_datetime& ld) TOML11_INLINE offset_datetime::offset_datetime(const local_datetime& ld)
: date(ld.date), time(ld.time), offset(get_local_offset(nullptr)) : date{ld.date}, time{ld.time}, offset{get_local_offset(nullptr)}
// use the current local timezone offset // use the current local timezone offset
{} {}
TOML11_INLINE offset_datetime::offset_datetime(const std::chrono::system_clock::time_point& tp) TOML11_INLINE offset_datetime::offset_datetime(const std::chrono::system_clock::time_point& tp)
: offset(0, 0) // use gmtime : offset{0, 0} // use gmtime
{ {
const auto timet = std::chrono::system_clock::to_time_t(tp); const auto timet = std::chrono::system_clock::to_time_t(tp);
const auto tm = detail::gmtime_s(&timet); const auto tm = detail::gmtime_s(&timet);
@@ -392,14 +392,14 @@ TOML11_INLINE offset_datetime::offset_datetime(const std::chrono::system_clock::
this->time = local_time(tm); this->time = local_time(tm);
} }
TOML11_INLINE offset_datetime::offset_datetime(const std::time_t& t) TOML11_INLINE offset_datetime::offset_datetime(const std::time_t& t)
: offset(0, 0) // use gmtime : offset{0, 0} // use gmtime
{ {
const auto tm = detail::gmtime_s(&t); const auto tm = detail::gmtime_s(&t);
this->date = local_date(tm); this->date = local_date(tm);
this->time = local_time(tm); this->time = local_time(tm);
} }
TOML11_INLINE offset_datetime::offset_datetime(const std::tm& t) TOML11_INLINE offset_datetime::offset_datetime(const std::tm& t)
: offset(0, 0) // assume gmtime : offset{0, 0} // assume gmtime
{ {
this->date = local_date(t); this->date = local_date(t);
this->time = local_time(t); this->time = local_time(t);