Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
e89c9464
Unverified
Commit
e89c9464
authored
Jan 20, 2019
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/nodiscard' into develop
parents
6de4df23
e36593e9
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
57 additions
and
3 deletions
+57
-3
include/nlohmann/detail/macro_scope.hpp
include/nlohmann/detail/macro_scope.hpp
+13
-0
include/nlohmann/detail/macro_unscope.hpp
include/nlohmann/detail/macro_unscope.hpp
+1
-0
include/nlohmann/json.hpp
include/nlohmann/json.hpp
+13
-0
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+27
-0
test/src/unit-cbor.cpp
test/src/unit-cbor.cpp
+1
-1
test/src/unit-readme.cpp
test/src/unit-readme.cpp
+1
-1
test/src/unit-ubjson.cpp
test/src/unit-ubjson.cpp
+1
-1
No files found.
include/nlohmann/detail/macro_scope.hpp
View file @
e89c9464
...
...
@@ -37,6 +37,19 @@
#define JSON_DEPRECATED
#endif
// allow for portable nodiscard warnings
#if defined(__has_cpp_attribute)
#if __has_cpp_attribute(nodiscard)
#define JSON_NODISCARD [[nodiscard]]
#elif __has_cpp_attribute(gnu::warn_unused_result)
#define JSON_NODISCARD [[gnu::warn_unused_result]]
#else
#define JSON_NODISCARD
#endif
#else
#define JSON_NODISCARD
#endif
// allow to disable exceptions
#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
#define JSON_THROW(exception) throw exception
...
...
include/nlohmann/detail/macro_unscope.hpp
View file @
e89c9464
...
...
@@ -16,6 +16,7 @@
#undef JSON_LIKELY
#undef JSON_UNLIKELY
#undef JSON_DEPRECATED
#undef JSON_NODISCARD
#undef JSON_HAS_CPP_14
#undef JSON_HAS_CPP_17
#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
...
...
include/nlohmann/json.hpp
View file @
e89c9464
...
...
@@ -317,6 +317,7 @@ class basic_json
@since 2.1.0
*/
JSON_NODISCARD
static
basic_json
meta
()
{
basic_json
result
;
...
...
@@ -1489,6 +1490,7 @@ class basic_json
@since version 1.0.0
*/
JSON_NODISCARD
static
basic_json
array
(
initializer_list_t
init
=
{})
{
return
basic_json
(
init
,
false
,
value_t
::
array
);
...
...
@@ -1532,6 +1534,7 @@ class basic_json
@since version 1.0.0
*/
JSON_NODISCARD
static
basic_json
object
(
initializer_list_t
init
=
{})
{
return
basic_json
(
init
,
false
,
value_t
::
object
);
...
...
@@ -6051,6 +6054,7 @@ class basic_json
@since version 2.0.3 (contiguous containers)
*/
JSON_NODISCARD
static
basic_json
parse
(
detail
::
input_adapter
&&
i
,
const
parser_callback_t
cb
=
nullptr
,
const
bool
allow_exceptions
=
true
)
...
...
@@ -6826,6 +6830,7 @@ class basic_json
@a strict parameter since 3.0.0; added @a allow_exceptions parameter
since 3.2.0
*/
JSON_NODISCARD
static
basic_json
from_cbor
(
detail
::
input_adapter
&&
i
,
const
bool
strict
=
true
,
const
bool
allow_exceptions
=
true
)
...
...
@@ -6841,6 +6846,7 @@ class basic_json
*/
template
<
typename
A1
,
typename
A2
,
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
JSON_NODISCARD
static
basic_json
from_cbor
(
A1
&&
a1
,
A2
&&
a2
,
const
bool
strict
=
true
,
const
bool
allow_exceptions
=
true
)
...
...
@@ -6933,6 +6939,7 @@ class basic_json
@a strict parameter since 3.0.0; added @a allow_exceptions parameter
since 3.2.0
*/
JSON_NODISCARD
static
basic_json
from_msgpack
(
detail
::
input_adapter
&&
i
,
const
bool
strict
=
true
,
const
bool
allow_exceptions
=
true
)
...
...
@@ -6948,6 +6955,7 @@ class basic_json
*/
template
<
typename
A1
,
typename
A2
,
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
JSON_NODISCARD
static
basic_json
from_msgpack
(
A1
&&
a1
,
A2
&&
a2
,
const
bool
strict
=
true
,
const
bool
allow_exceptions
=
true
)
...
...
@@ -7019,6 +7027,7 @@ class basic_json
@since version 3.1.0; added @a allow_exceptions parameter since 3.2.0
*/
JSON_NODISCARD
static
basic_json
from_ubjson
(
detail
::
input_adapter
&&
i
,
const
bool
strict
=
true
,
const
bool
allow_exceptions
=
true
)
...
...
@@ -7034,6 +7043,7 @@ class basic_json
*/
template
<
typename
A1
,
typename
A2
,
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
JSON_NODISCARD
static
basic_json
from_ubjson
(
A1
&&
a1
,
A2
&&
a2
,
const
bool
strict
=
true
,
const
bool
allow_exceptions
=
true
)
...
...
@@ -7104,6 +7114,7 @@ class basic_json
@sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
related UBJSON format
*/
JSON_NODISCARD
static
basic_json
from_bson
(
detail
::
input_adapter
&&
i
,
const
bool
strict
=
true
,
const
bool
allow_exceptions
=
true
)
...
...
@@ -7119,6 +7130,7 @@ class basic_json
*/
template
<
typename
A1
,
typename
A2
,
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
JSON_NODISCARD
static
basic_json
from_bson
(
A1
&&
a1
,
A2
&&
a2
,
const
bool
strict
=
true
,
const
bool
allow_exceptions
=
true
)
...
...
@@ -7710,6 +7722,7 @@ class basic_json
@since version 2.0.0
*/
JSON_NODISCARD
static
basic_json
diff
(
const
basic_json
&
source
,
const
basic_json
&
target
,
const
std
::
string
&
path
=
""
)
{
...
...
single_include/nlohmann/json.hpp
View file @
e89c9464
...
...
@@ -152,6 +152,19 @@ using json = basic_json<>;
#define JSON_DEPRECATED
#endif
// allow for portable nodiscard warnings
#if defined(__has_cpp_attribute)
#if __has_cpp_attribute(nodiscard)
#define JSON_NODISCARD [[nodiscard]]
#elif __has_cpp_attribute(gnu::warn_unused_result)
#define JSON_NODISCARD [[gnu::warn_unused_result]]
#else
#define JSON_NODISCARD
#endif
#else
#define JSON_NODISCARD
#endif
// allow to disable exceptions
#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
#define JSON_THROW(exception) throw exception
...
...
@@ -12803,6 +12816,7 @@ class basic_json
@since 2.1.0
*/
JSON_NODISCARD
static
basic_json
meta
()
{
basic_json
result
;
...
...
@@ -13975,6 +13989,7 @@ class basic_json
@since version 1.0.0
*/
JSON_NODISCARD
static
basic_json
array
(
initializer_list_t
init
=
{})
{
return
basic_json
(
init
,
false
,
value_t
::
array
);
...
...
@@ -14018,6 +14033,7 @@ class basic_json
@since version 1.0.0
*/
JSON_NODISCARD
static
basic_json
object
(
initializer_list_t
init
=
{})
{
return
basic_json
(
init
,
false
,
value_t
::
object
);
...
...
@@ -18537,6 +18553,7 @@ class basic_json
@since version 2.0.3 (contiguous containers)
*/
JSON_NODISCARD
static
basic_json
parse
(
detail
::
input_adapter
&&
i
,
const
parser_callback_t
cb
=
nullptr
,
const
bool
allow_exceptions
=
true
)
...
...
@@ -19312,6 +19329,7 @@ class basic_json
@a strict parameter since 3.0.0; added @a allow_exceptions parameter
since 3.2.0
*/
JSON_NODISCARD
static
basic_json
from_cbor
(
detail
::
input_adapter
&&
i
,
const
bool
strict
=
true
,
const
bool
allow_exceptions
=
true
)
...
...
@@ -19327,6 +19345,7 @@ class basic_json
*/
template
<
typename
A1
,
typename
A2
,
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
JSON_NODISCARD
static
basic_json
from_cbor
(
A1
&&
a1
,
A2
&&
a2
,
const
bool
strict
=
true
,
const
bool
allow_exceptions
=
true
)
...
...
@@ -19419,6 +19438,7 @@ class basic_json
@a strict parameter since 3.0.0; added @a allow_exceptions parameter
since 3.2.0
*/
JSON_NODISCARD
static
basic_json
from_msgpack
(
detail
::
input_adapter
&&
i
,
const
bool
strict
=
true
,
const
bool
allow_exceptions
=
true
)
...
...
@@ -19434,6 +19454,7 @@ class basic_json
*/
template
<
typename
A1
,
typename
A2
,
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
JSON_NODISCARD
static
basic_json
from_msgpack
(
A1
&&
a1
,
A2
&&
a2
,
const
bool
strict
=
true
,
const
bool
allow_exceptions
=
true
)
...
...
@@ -19505,6 +19526,7 @@ class basic_json
@since version 3.1.0; added @a allow_exceptions parameter since 3.2.0
*/
JSON_NODISCARD
static
basic_json
from_ubjson
(
detail
::
input_adapter
&&
i
,
const
bool
strict
=
true
,
const
bool
allow_exceptions
=
true
)
...
...
@@ -19520,6 +19542,7 @@ class basic_json
*/
template
<
typename
A1
,
typename
A2
,
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
JSON_NODISCARD
static
basic_json
from_ubjson
(
A1
&&
a1
,
A2
&&
a2
,
const
bool
strict
=
true
,
const
bool
allow_exceptions
=
true
)
...
...
@@ -19590,6 +19613,7 @@ class basic_json
@sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
related UBJSON format
*/
JSON_NODISCARD
static
basic_json
from_bson
(
detail
::
input_adapter
&&
i
,
const
bool
strict
=
true
,
const
bool
allow_exceptions
=
true
)
...
...
@@ -19605,6 +19629,7 @@ class basic_json
*/
template
<
typename
A1
,
typename
A2
,
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
JSON_NODISCARD
static
basic_json
from_bson
(
A1
&&
a1
,
A2
&&
a2
,
const
bool
strict
=
true
,
const
bool
allow_exceptions
=
true
)
...
...
@@ -20196,6 +20221,7 @@ class basic_json
@since version 2.0.0
*/
JSON_NODISCARD
static
basic_json
diff
(
const
basic_json
&
source
,
const
basic_json
&
target
,
const
std
::
string
&
path
=
""
)
{
...
...
@@ -20515,6 +20541,7 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std
#undef JSON_LIKELY
#undef JSON_UNLIKELY
#undef JSON_DEPRECATED
#undef JSON_NODISCARD
#undef JSON_HAS_CPP_14
#undef JSON_HAS_CPP_17
#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
...
...
test/src/unit-cbor.cpp
View file @
e89c9464
...
...
@@ -1962,7 +1962,7 @@ TEST_CASE("all CBOR first bytes", "[!throws]")
try
{
json
::
from_cbor
(
std
::
vector
<
uint8_t
>
(
1
,
byte
));
auto
res
=
json
::
from_cbor
(
std
::
vector
<
uint8_t
>
(
1
,
byte
));
}
catch
(
const
json
::
parse_error
&
e
)
{
...
...
test/src/unit-readme.cpp
View file @
e89c9464
...
...
@@ -305,7 +305,7 @@ TEST_CASE("README", "[hide]")
// }
// calculate a JSON patch from two JSON values
json
::
diff
(
j_result
,
j_original
);
auto
res
=
json
::
diff
(
j_result
,
j_original
);
// [
// { "op":" replace", "path": "/baz", "value": ["one", "two", "three"] },
// { "op":"remove","path":"/hello" },
...
...
test/src/unit-ubjson.cpp
View file @
e89c9464
...
...
@@ -2128,7 +2128,7 @@ TEST_CASE("all UBJSON first bytes", "[!throws]")
try
{
json
::
from_ubjson
(
std
::
vector
<
uint8_t
>
(
1
,
byte
));
auto
res
=
json
::
from_ubjson
(
std
::
vector
<
uint8_t
>
(
1
,
byte
));
}
catch
(
const
json
::
parse_error
&
e
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment