diff --git a/include/ircd/json/member.h b/include/ircd/json/member.h index 7223e5f8e..327383410 100644 --- a/include/ircd/json/member.h +++ b/include/ircd/json/member.h @@ -14,7 +14,7 @@ namespace ircd::json { struct member; - using members = std::initializer_list; + using members = std::initializer_list; bool operator==(const member &a, const member &b); bool operator==(const member &a, const string_view &b); @@ -63,24 +63,24 @@ ircd::json::member::member(const string_view &key, template ircd::json::member::member(const string_view &key, V&& v) -:std::pair +:member { - { key, json::STRING }, std::forward(v) + key, value { std::forward(v) } } {} inline ircd::json::member::member(const object::member &m) -:std::pair +:member { - { m.first, json::STRING }, value { m.second, type(m.second) } + m.first, value { m.second, type(m.second) } } {} inline ircd::json::member::member(const string_view &k) -:std::pair +:member { - { k, json::STRING }, string_view{} + k, value{} } {} diff --git a/include/ircd/json/tuple/tuple.h b/include/ircd/json/tuple/tuple.h index d64aad859..0879c19ed 100644 --- a/include/ircd/json/tuple/tuple.h +++ b/include/ircd/json/tuple/tuple.h @@ -67,7 +67,7 @@ struct tuple template explicit tuple(const tuple &, const json::keys &); tuple(const json::object &); tuple(const json::iov &); - tuple(const std::initializer_list &); + tuple(const json::members &); tuple() = default; }; @@ -200,7 +200,7 @@ tuple::tuple(const json::iov &iov) } template -tuple::tuple(const std::initializer_list &members) +tuple::tuple(const json::members &members) { std::for_each(std::begin(members), std::end(members), [this] (const auto &member) diff --git a/include/ircd/json/type.h b/include/ircd/json/type.h index ccb66f7a0..a3c331bb5 100644 --- a/include/ircd/json/type.h +++ b/include/ircd/json/type.h @@ -21,7 +21,7 @@ namespace ircd::json struct array; struct vector; struct iov; - using members = std::initializer_list; + using members = std::initializer_list; enum type type(const string_view &); enum type type(const string_view &, std::nothrow_t);