AuroraMiddleware/nlohmannjson
1
0
Fork 0
mirror of https://github.com/nlohmann/json synced 2024-11-28 06:31:03 +00:00
Code Issues Releases Wiki Activity

minor message/comments tweak

Browse Source
This commit is contained in:
Théo DELRIEU 2017-01-14 02:47:02 +01:00
parent 63e4249e9f
commit f2c71fafda
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/json.hpp
View File

@ -3027,16 +3027,16 @@ class basic_json
uncvref_t<T>>::value, uncvref_t<T>>::value,
int> = 0> int> = 0>
// do we really want the uncvref ? if a user call get<int &>, shouldn't we // do we really want the uncvref ? if a user call get<int &>, shouldn't we
// i know there is a special behaviour for boolean_t* and such
// static assert ? // static assert ?
// i know there is a special behaviour for boolean_t* and such
auto get() const noexcept(noexcept(JSONSerializer<uncvref_t<T>>::from_json( auto get() const noexcept(noexcept(JSONSerializer<uncvref_t<T>>::from_json(
std::declval<basic_json_t const &>(), std::declval<uncvref_t<T> &>()))) std::declval<basic_json_t const &>(), std::declval<uncvref_t<T> &>())))
-> uncvref_t<T> -> uncvref_t<T>
{ {
using type = uncvref_t<T>; using type = uncvref_t<T>;
static_assert(std::is_default_constructible<type>::value && static_assert(std::is_default_constructible<type>::value and
std::is_copy_constructible<type>::value, std::is_copy_constructible<type>::value,
"user-defined types must be DefaultConstructible and " "Types must be DefaultConstructible and "
"CopyConstructible when used with get"); "CopyConstructible when used with get");
type ret; type ret;
JSONSerializer<type>::from_json(*this, ret); JSONSerializer<type>::from_json(*this, ret);
@ -3052,12 +3052,11 @@ class basic_json
detail::has_non_default_from_json<basic_json_t, detail::has_non_default_from_json<basic_json_t,
uncvref_t<T>>::value, uncvref_t<T>>::value,
int> = 0> int> = 0>
constexpr uncvref_t<T> get() const noexcept(noexcept(JSONSerializer<T>::from_json(std::declval<basic_json_t const&>()))) uncvref_t<T> get() const noexcept(noexcept(JSONSerializer<T>::from_json(std::declval<basic_json_t const&>())))
{ {
return JSONSerializer<T>::from_json(*this); return JSONSerializer<T>::from_json(*this);
} }
// TODO what to do with those...
/*! /*!
@brief get a pointer value (explicit) @brief get a pointer value (explicit)