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

fix #246: use brace-init in major/minor

Browse Source 
to avoid name collision with <sys/sysmacros> major and minor
This commit is contained in:
ToruNiina
2024-06-19 01:36:40 +09:00
parent 4efae93585
commit 74bea5368a
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/toml11/spec.hpp
View File

@@ -12,7 +12,7 @@ namespace toml
struct semantic_version struct semantic_version
{ {
constexpr semantic_version(std::uint32_t mjr, std::uint32_t mnr, std::uint32_t p) noexcept constexpr semantic_version(std::uint32_t mjr, std::uint32_t mnr, std::uint32_t p) noexcept
: major(mjr), minor(mnr), patch(p) : major{mjr}, minor{mnr}, patch{p}
{} {}
std::uint32_t major; std::uint32_t major;
@@ -87,17 +87,17 @@ struct spec
} }
constexpr explicit spec(const semantic_version& semver) noexcept constexpr explicit spec(const semantic_version& semver) noexcept
: version(semver), : version{semver},
v1_1_0_allow_control_characters_in_comments (semantic_version(1, 1, 0) <= semver), v1_1_0_allow_control_characters_in_comments {semantic_version{1, 1, 0} <= semver},
v1_1_0_allow_newlines_in_inline_tables (semantic_version(1, 1, 0) <= semver), v1_1_0_allow_newlines_in_inline_tables {semantic_version{1, 1, 0} <= semver},
v1_1_0_allow_trailing_comma_in_inline_tables(semantic_version(1, 1, 0) <= semver), v1_1_0_allow_trailing_comma_in_inline_tables{semantic_version{1, 1, 0} <= semver},
v1_1_0_allow_non_english_in_bare_keys (semantic_version(1, 1, 0) <= semver), v1_1_0_allow_non_english_in_bare_keys {semantic_version{1, 1, 0} <= semver},
v1_1_0_add_escape_sequence_e (semantic_version(1, 1, 0) <= semver), v1_1_0_add_escape_sequence_e {semantic_version{1, 1, 0} <= semver},
v1_1_0_add_escape_sequence_x (semantic_version(1, 1, 0) <= semver), v1_1_0_add_escape_sequence_x {semantic_version{1, 1, 0} <= semver},
v1_1_0_make_seconds_optional (semantic_version(1, 1, 0) <= semver), v1_1_0_make_seconds_optional {semantic_version{1, 1, 0} <= semver},
ext_hex_float (false), ext_hex_float {false},
ext_num_suffix(false), ext_num_suffix{false},
ext_null_value(false) ext_null_value{false}
{} {}
semantic_version version; // toml version semantic_version version; // toml version