lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-28 12:02:00 +03:00
Code Activity

💚 added regression tests for #972 and #977

Browse Source
This commit is contained in:
Niels Lohmann
2018-03-06 20:13:31 +01:00
parent 62030615a0
commit 476b2e09be
8 changed files with 643 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/nlohmann/json.hpp
View File

@ -1247,7 +1247,8 @@ class basic_json
@brief create a JSON value from an existing one
This is a constructor for existing @ref basic_json types.
It does not hijack copy/move constructors, since the parameter has different template arguments than the current ones.
It does not hijack copy/move constructors, since the parameter has different
template arguments than the current ones.
The constructor tries to convert the internal @ref m_value of the parameter.
@ -2489,7 +2490,8 @@ class basic_json
/*!
@brief get special-case overload
This overloads converts the current @ref basic_json in a different @ref basic_json type
This overloads converts the current @ref basic_json in a different
@ref basic_json type
@tparam BasicJsonType == @ref basic_json
@ -2502,15 +2504,12 @@ class basic_json
*/
template<typename BasicJsonType, detail::enable_if_t<
not std::is_same<BasicJsonType, basic_json>::value and
detail::is_basic_json<BasicJsonType>::value
,
int> = 0>
detail::is_basic_json<BasicJsonType>::value, int> = 0>
BasicJsonType get() const
{
return *this;
}
/*!
@brief get a value (explicit)