Unverified Commit 9154e991 authored by Niels Lohmann's avatar Niels Lohmann

Merge branch 'develop' into feature/issue1913

parents 61b46a56 6121fc52
...@@ -131,18 +131,6 @@ matrix: ...@@ -131,18 +131,6 @@ matrix:
# OSX / Clang # OSX / Clang
- os: osx
osx_image: xcode8.3
- os: osx
osx_image: xcode9
- os: osx
osx_image: xcode9.1
- os: osx
osx_image: xcode9.2
- os: osx - os: osx
osx_image: xcode9.3 osx_image: xcode9.3
......
MIT License MIT License
Copyright (c) 2013-2019 Niels Lohmann Copyright (c) 2013-2020 Niels Lohmann
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/f3732b3327e34358a0e9d1fe9f661f08)](https://www.codacy.com/app/nlohmann/json?utm_source=github.com&utm_medium=referral&utm_content=nlohmann/json&utm_campaign=Badge_Grade) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/f3732b3327e34358a0e9d1fe9f661f08)](https://www.codacy.com/app/nlohmann/json?utm_source=github.com&utm_medium=referral&utm_content=nlohmann/json&utm_campaign=Badge_Grade)
[![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/nlohmann/json.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/nlohmann/json/context:cpp) [![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/nlohmann/json.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/nlohmann/json/context:cpp)
[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/json.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:json) [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/json.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:json)
[![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/TarF5pPn9NtHQjhf) [![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/3lCHrFUZANONKv7a)
[![Documentation](https://img.shields.io/badge/docs-doxygen-blue.svg)](http://nlohmann.github.io/json) [![Documentation](https://img.shields.io/badge/docs-doxygen-blue.svg)](http://nlohmann.github.io/json)
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/nlohmann/json/master/LICENSE.MIT) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/nlohmann/json/master/LICENSE.MIT)
[![GitHub Releases](https://img.shields.io/github/release/nlohmann/json.svg)](https://github.com/nlohmann/json/releases) [![GitHub Releases](https://img.shields.io/github/release/nlohmann/json.svg)](https://github.com/nlohmann/json/releases)
...@@ -69,6 +69,8 @@ You can sponsor this library at [GitHub Sponsors](https://github.com/sponsors/nl ...@@ -69,6 +69,8 @@ You can sponsor this library at [GitHub Sponsors](https://github.com/sponsors/nl
### :label: Named Sponsors ### :label: Named Sponsors
- [Michael Hartmann](https://github.com/reFX-Mike) - [Michael Hartmann](https://github.com/reFX-Mike)
- [Stefan Hagen](https://github.com/sthagen)
- [Steve Sperandeo](https://github.com/homer6)
Thanks everyone! Thanks everyone!
...@@ -311,7 +313,7 @@ You can also get a string representation of a JSON value (serialize): ...@@ -311,7 +313,7 @@ You can also get a string representation of a JSON value (serialize):
```cpp ```cpp
// explicit conversion to string // explicit conversion to string
std::string s = j.dump(); // {\"happy\":true,\"pi\":3.141} std::string s = j.dump(); // {"happy":true,"pi":3.141}
// serialization with pretty printing // serialization with pretty printing
// pass in the amount of spaces to indent // pass in the amount of spaces to indent
...@@ -1071,10 +1073,6 @@ The following compilers are currently used in continuous integration at [Travis] ...@@ -1071,10 +1073,6 @@ The following compilers are currently used in continuous integration at [Travis]
| Clang 5.0.2 | Ubuntu 14.04.1 LTS | clang version 5.0.2-svn328729-1~exp1~20180509123505.100 (branches/release_50) | | Clang 5.0.2 | Ubuntu 14.04.1 LTS | clang version 5.0.2-svn328729-1~exp1~20180509123505.100 (branches/release_50) |
| Clang 6.0.1 | Ubuntu 14.04.1 LTS | clang version 6.0.1-svn334776-1~exp1~20180726133705.85 (branches/release_60) | | Clang 6.0.1 | Ubuntu 14.04.1 LTS | clang version 6.0.1-svn334776-1~exp1~20180726133705.85 (branches/release_60) |
| Clang 7.0.1 | Ubuntu 14.04.1 LTS | clang version 7.0.1-svn348686-1~exp1~20181213084532.54 (branches/release_70) | | Clang 7.0.1 | Ubuntu 14.04.1 LTS | clang version 7.0.1-svn348686-1~exp1~20181213084532.54 (branches/release_70) |
| Clang Xcode 8.3 | OSX 10.11.6 | Apple LLVM version 8.1.0 (clang-802.0.38) |
| Clang Xcode 9.0 | OSX 10.12.6 | Apple LLVM version 9.0.0 (clang-900.0.37) |
| Clang Xcode 9.1 | OSX 10.12.6 | Apple LLVM version 9.0.0 (clang-900.0.38) |
| Clang Xcode 9.2 | OSX 10.13.3 | Apple LLVM version 9.1.0 (clang-902.0.39.1) |
| Clang Xcode 9.3 | OSX 10.13.3 | Apple LLVM version 9.1.0 (clang-902.0.39.2) | | Clang Xcode 9.3 | OSX 10.13.3 | Apple LLVM version 9.1.0 (clang-902.0.39.2) |
| Clang Xcode 10.0 | OSX 10.13.3 | Apple LLVM version 10.0.0 (clang-1000.11.45.2) | | Clang Xcode 10.0 | OSX 10.13.3 | Apple LLVM version 10.0.0 (clang-1000.11.45.2) |
| Clang Xcode 10.1 | OSX 10.13.3 | Apple LLVM version 10.0.0 (clang-1000.11.45.5) | | Clang Xcode 10.1 | OSX 10.13.3 | Apple LLVM version 10.0.0 (clang-1000.11.45.5) |
...@@ -1384,6 +1382,15 @@ This library will not support comments in the future. If you wish to use comment ...@@ -1384,6 +1382,15 @@ This library will not support comments in the future. If you wish to use comment
By default, the library does not preserve the **insertion order of object elements**. This is standards-compliant, as the [JSON standard](https://tools.ietf.org/html/rfc8259.html) defines objects as "an unordered collection of zero or more name/value pairs". If you do want to preserve the insertion order, you can specialize the object type with containers like [`tsl::ordered_map`](https://github.com/Tessil/ordered-map) ([integration](https://github.com/nlohmann/json/issues/546#issuecomment-304447518)) or [`nlohmann::fifo_map`](https://github.com/nlohmann/fifo_map) ([integration](https://github.com/nlohmann/json/issues/485#issuecomment-333652309)). By default, the library does not preserve the **insertion order of object elements**. This is standards-compliant, as the [JSON standard](https://tools.ietf.org/html/rfc8259.html) defines objects as "an unordered collection of zero or more name/value pairs". If you do want to preserve the insertion order, you can specialize the object type with containers like [`tsl::ordered_map`](https://github.com/Tessil/ordered-map) ([integration](https://github.com/nlohmann/json/issues/546#issuecomment-304447518)) or [`nlohmann::fifo_map`](https://github.com/nlohmann/fifo_map) ([integration](https://github.com/nlohmann/json/issues/485#issuecomment-333652309)).
### Memory Release
We checked with Valgrind and the Address Sanitizer (ASAN) that there are no memory leaks.
If you find that a parsing program with this library does not release memory, please consider the following case and it maybe unrelated to this library.
**Your program is compiled with glibc.** There is a tunable threshold that glibc uses to decide whether to actually return memory to the system or whether to cache it for later reuse. If in your program you make lots of small allocations and those small allocations are not a contiguous block and are presumably below the threshold, then they will not get returned to the OS.
Here is a related issue [#1924](https://github.com/nlohmann/json/issues/1924).
### Further notes ### Further notes
- The code contains numerous debug **assertions** which can be switched off by defining the preprocessor macro `NDEBUG`, see the [documentation of `assert`](https://en.cppreference.com/w/cpp/error/assert). In particular, note [`operator[]`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a233b02b0839ef798942dd46157cc0fe6.html#a233b02b0839ef798942dd46157cc0fe6) implements **unchecked access** for const objects: If the given key is not present, the behavior is undefined (think of a dereferenced null pointer) and yields an [assertion failure](https://github.com/nlohmann/json/issues/289) if assertions are switched on. If you are not sure whether an element in an object exists, use checked access with the [`at()` function](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a73ae333487310e3302135189ce8ff5d8.html#a73ae333487310e3302135189ce8ff5d8). - The code contains numerous debug **assertions** which can be switched off by defining the preprocessor macro `NDEBUG`, see the [documentation of `assert`](https://en.cppreference.com/w/cpp/error/assert). In particular, note [`operator[]`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a233b02b0839ef798942dd46157cc0fe6.html#a233b02b0839ef798942dd46157cc0fe6) implements **unchecked access** for const objects: If the given key is not present, the behavior is undefined (think of a dereferenced null pointer) and yields an [assertion failure](https://github.com/nlohmann/json/issues/289) if assertions are switched on. If you are not sure whether an element in an object exists, use checked access with the [`at()` function](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a73ae333487310e3302135189ce8ff5d8.html#a73ae333487310e3302135189ce8ff5d8).
......
...@@ -85,7 +85,7 @@ environment: ...@@ -85,7 +85,7 @@ environment:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
configuration: Release configuration: Release
platform: x64 platform: x64
CXX_FLAGS: "/permissive- /std:c++latest /utf-8 /F4000000" CXX_FLAGS: "/permissive- /std:c++latest /Zc:__cplusplus /utf-8 /F4000000"
LINKER_FLAGS: "/STACK:4000000" LINKER_FLAGS: "/STACK:4000000"
GENERATOR: Visual Studio 15 2017 GENERATOR: Visual Studio 15 2017
......
...@@ -6,7 +6,7 @@ using json = nlohmann::json; ...@@ -6,7 +6,7 @@ using json = nlohmann::json;
int main() int main()
{ {
// create JSON object // create JSON object
json object = const json object =
{ {
{"the good", "il buono"}, {"the good", "il buono"},
{"the bad", "il cattivo"}, {"the bad", "il cattivo"},
......
...@@ -8,7 +8,7 @@ int main() ...@@ -8,7 +8,7 @@ int main()
// create an array value // create an array value
json array = {1, 2, 3, 4, 5}; json array = {1, 2, 3, 4, 5};
// get am iterator to the first element // get an iterator to the first element
json::iterator it = array.begin(); json::iterator it = array.begin();
// serialize the element that the iterator points to // serialize the element that the iterator points to
......
...@@ -8,7 +8,7 @@ int main() ...@@ -8,7 +8,7 @@ int main()
// create an array value // create an array value
const json array = {1, 2, 3, 4, 5}; const json array = {1, 2, 3, 4, 5};
// get am iterator to the first element // get an iterator to the first element
json::const_iterator it = array.cbegin(); json::const_iterator it = array.cbegin();
// serialize the element that the iterator points to // serialize the element that the iterator points to
......
...@@ -8,7 +8,7 @@ int main() ...@@ -8,7 +8,7 @@ int main()
// create an array value // create an array value
json array = {1, 2, 3, 4, 5}; json array = {1, 2, 3, 4, 5};
// get am iterator to one past the last element // get an iterator to one past the last element
json::const_iterator it = array.cend(); json::const_iterator it = array.cend();
// decrement the iterator to point to the last element // decrement the iterator to point to the last element
......
...@@ -14,7 +14,6 @@ int main() ...@@ -14,7 +14,6 @@ int main()
std::cout << std::boolalpha std::cout << std::boolalpha
<< j.contains("/number"_json_pointer) << '\n' << j.contains("/number"_json_pointer) << '\n'
<< j.contains("/string"_json_pointer) << '\n' << j.contains("/string"_json_pointer) << '\n'
<< j.contains("/string"_json_pointer) << '\n'
<< j.contains("/array"_json_pointer) << '\n' << j.contains("/array"_json_pointer) << '\n'
<< j.contains("/array/1"_json_pointer) << '\n' << j.contains("/array/1"_json_pointer) << '\n'
<< j.contains("/array/-"_json_pointer) << '\n' << j.contains("/array/-"_json_pointer) << '\n'
......
...@@ -8,7 +8,7 @@ int main() ...@@ -8,7 +8,7 @@ int main()
// create a JSON object // create a JSON object
json j_object = {{"one", 1}, {"two", 2}}; json j_object = {{"one", 1}, {"two", 2}};
// call find // call count()
auto count_two = j_object.count("two"); auto count_two = j_object.count("two");
auto count_three = j_object.count("three"); auto count_three = j_object.count("three");
......
...@@ -8,7 +8,7 @@ int main() ...@@ -8,7 +8,7 @@ int main()
// create an array value // create an array value
json array = {1, 2, 3, 4, 5}; json array = {1, 2, 3, 4, 5};
// get am iterator to one past the last element // get an iterator to one past the last element
json::iterator it = array.end(); json::iterator it = array.end();
// decrement the iterator to point to the last element // decrement the iterator to point to the last element
......
...@@ -13,7 +13,7 @@ int main() ...@@ -13,7 +13,7 @@ int main()
json j_array = {1, 2, 4, 8, 16}; json j_array = {1, 2, 4, 8, 16};
json j_string = "Hello, world"; json j_string = "Hello, world";
// call erase // call erase()
j_boolean.erase(j_boolean.begin()); j_boolean.erase(j_boolean.begin());
j_number_integer.erase(j_number_integer.begin()); j_number_integer.erase(j_number_integer.begin());
j_number_float.erase(j_number_float.begin()); j_number_float.erase(j_number_float.begin());
......
...@@ -13,7 +13,7 @@ int main() ...@@ -13,7 +13,7 @@ int main()
json j_array = {1, 2, 4, 8, 16}; json j_array = {1, 2, 4, 8, 16};
json j_string = "Hello, world"; json j_string = "Hello, world";
// call erase // call erase()
j_boolean.erase(j_boolean.begin(), j_boolean.end()); j_boolean.erase(j_boolean.begin(), j_boolean.end());
j_number_integer.erase(j_number_integer.begin(), j_number_integer.end()); j_number_integer.erase(j_number_integer.begin(), j_number_integer.end());
j_number_float.erase(j_number_float.begin(), j_number_float.end()); j_number_float.erase(j_number_float.begin(), j_number_float.end());
......
...@@ -8,7 +8,7 @@ int main() ...@@ -8,7 +8,7 @@ int main()
// create a JSON object // create a JSON object
json j_object = {{"one", 1}, {"two", 2}}; json j_object = {{"one", 1}, {"two", 2}};
// call erase // call erase()
auto count_one = j_object.erase("one"); auto count_one = j_object.erase("one");
auto count_three = j_object.erase("three"); auto count_three = j_object.erase("three");
......
...@@ -8,7 +8,7 @@ int main() ...@@ -8,7 +8,7 @@ int main()
// create a JSON array // create a JSON array
json j_array = {0, 1, 2, 3, 4, 5}; json j_array = {0, 1, 2, 3, 4, 5};
// call erase // call erase()
j_array.erase(2); j_array.erase(2);
// print values // print values
......
...@@ -6,7 +6,7 @@ using json = nlohmann::json; ...@@ -6,7 +6,7 @@ using json = nlohmann::json;
int main() int main()
{ {
// create JSON array // create JSON array
json array = {"first", "2nd", "third", "fourth"}; const json array = {"first", "2nd", "third", "fourth"};
// output element at index 2 (third element) // output element at index 2 (third element)
std::cout << array.at(2) << '\n'; std::cout << array.at(2) << '\n';
......
...@@ -126,8 +126,8 @@ class json_pointer ...@@ -126,8 +126,8 @@ class json_pointer
/*! /*!
@brief append an array index at the end of this JSON pointer @brief append an array index at the end of this JSON pointer
@param[in] array_index array index to append @param[in] array_idx array index to append
@return JSON pointer with @a array_index appended @return JSON pointer with @a array_idx appended
@liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add} @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
...@@ -139,9 +139,9 @@ class json_pointer ...@@ -139,9 +139,9 @@ class json_pointer
@since version 3.6.0 @since version 3.6.0
*/ */
json_pointer& operator/=(std::size_t array_index) json_pointer& operator/=(std::size_t array_idx)
{ {
return *this /= std::to_string(array_index); return *this /= std::to_string(array_idx);
} }
/*! /*!
...@@ -189,8 +189,8 @@ class json_pointer ...@@ -189,8 +189,8 @@ class json_pointer
@brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
@param[in] ptr JSON pointer @param[in] ptr JSON pointer
@param[in] array_index array index @param[in] array_idx array index
@return a new JSON pointer with @a array_index appended to @a ptr @return a new JSON pointer with @a array_idx appended to @a ptr
@liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary} @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
...@@ -200,9 +200,9 @@ class json_pointer ...@@ -200,9 +200,9 @@ class json_pointer
@since version 3.6.0 @since version 3.6.0
*/ */
friend json_pointer operator/(const json_pointer& ptr, std::size_t array_index) friend json_pointer operator/(const json_pointer& ptr, std::size_t array_idx)
{ {
return json_pointer(ptr) /= array_index; return json_pointer(ptr) /= array_idx;
} }
/*! /*!
......
...@@ -2921,12 +2921,9 @@ class basic_json ...@@ -2921,12 +2921,9 @@ class basic_json
not std::is_same<ValueType, detail::json_ref<basic_json>>::value and not std::is_same<ValueType, detail::json_ref<basic_json>>::value and
not std::is_same<ValueType, typename string_t::value_type>::value and not std::is_same<ValueType, typename string_t::value_type>::value and
not detail::is_basic_json<ValueType>::value not detail::is_basic_json<ValueType>::value
#ifndef _MSC_VER // fix for issue #167 operator<< ambiguity under VS2015
and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) and _MSC_VER <= 1914)) #if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) and _MSC_VER <= 1914))
and not std::is_same<ValueType, typename std::string_view>::value and not std::is_same<ValueType, typename std::string_view>::value
#endif
#endif #endif
and detail::is_detected<detail::get_template_function, const basic_json_t&, ValueType>::value and detail::is_detected<detail::get_template_function, const basic_json_t&, ValueType>::value
, int >::type = 0 > , int >::type = 0 >
...@@ -4878,9 +4875,7 @@ class basic_json ...@@ -4878,9 +4875,7 @@ class basic_json
// add element to array (move semantics) // add element to array (move semantics)
m_value.array->push_back(std::move(val)); m_value.array->push_back(std::move(val));
// invalidate object: mark it null so we do not call the destructor // if val is moved from, basic_json move constructor marks it null so we do not call the destructor
// cppcheck-suppress accessMoved
val.m_type = value_t::null;
} }
/*! /*!
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#undef JSON_HEDLEY_ARRAY_PARAM #undef JSON_HEDLEY_ARRAY_PARAM
#undef JSON_HEDLEY_ASSUME #undef JSON_HEDLEY_ASSUME
#undef JSON_HEDLEY_BEGIN_C_DECLS #undef JSON_HEDLEY_BEGIN_C_DECLS
#undef JSON_HEDLEY_C_DECL
#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
#undef JSON_HEDLEY_CLANG_HAS_BUILTIN #undef JSON_HEDLEY_CLANG_HAS_BUILTIN
#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
...@@ -15,13 +14,16 @@ ...@@ -15,13 +14,16 @@
#undef JSON_HEDLEY_COMPCERT_VERSION #undef JSON_HEDLEY_COMPCERT_VERSION
#undef JSON_HEDLEY_COMPCERT_VERSION_CHECK #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
#undef JSON_HEDLEY_CONCAT #undef JSON_HEDLEY_CONCAT
#undef JSON_HEDLEY_CONCAT3
#undef JSON_HEDLEY_CONCAT3_EX
#undef JSON_HEDLEY_CONCAT_EX #undef JSON_HEDLEY_CONCAT_EX
#undef JSON_HEDLEY_CONST #undef JSON_HEDLEY_CONST
#undef JSON_HEDLEY_CONST_CAST
#undef JSON_HEDLEY_CONSTEXPR #undef JSON_HEDLEY_CONSTEXPR
#undef JSON_HEDLEY_CONST_CAST
#undef JSON_HEDLEY_CPP_CAST #undef JSON_HEDLEY_CPP_CAST
#undef JSON_HEDLEY_CRAY_VERSION #undef JSON_HEDLEY_CRAY_VERSION
#undef JSON_HEDLEY_CRAY_VERSION_CHECK #undef JSON_HEDLEY_CRAY_VERSION_CHECK
#undef JSON_HEDLEY_C_DECL
#undef JSON_HEDLEY_DEPRECATED #undef JSON_HEDLEY_DEPRECATED
#undef JSON_HEDLEY_DEPRECATED_FOR #undef JSON_HEDLEY_DEPRECATED_FOR
#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
...@@ -37,7 +39,6 @@ ...@@ -37,7 +39,6 @@
#undef JSON_HEDLEY_EMSCRIPTEN_VERSION #undef JSON_HEDLEY_EMSCRIPTEN_VERSION
#undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
#undef JSON_HEDLEY_END_C_DECLS #undef JSON_HEDLEY_END_C_DECLS
#undef JSON_HEDLEY_FALL_THROUGH
#undef JSON_HEDLEY_FLAGS #undef JSON_HEDLEY_FLAGS
#undef JSON_HEDLEY_FLAGS_CAST #undef JSON_HEDLEY_FLAGS_CAST
#undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
...@@ -83,8 +84,8 @@ ...@@ -83,8 +84,8 @@
#undef JSON_HEDLEY_MSVC_VERSION #undef JSON_HEDLEY_MSVC_VERSION
#undef JSON_HEDLEY_MSVC_VERSION_CHECK #undef JSON_HEDLEY_MSVC_VERSION_CHECK
#undef JSON_HEDLEY_NEVER_INLINE #undef JSON_HEDLEY_NEVER_INLINE
#undef JSON_HEDLEY_NO_ESCAPE
#undef JSON_HEDLEY_NON_NULL #undef JSON_HEDLEY_NON_NULL
#undef JSON_HEDLEY_NO_ESCAPE
#undef JSON_HEDLEY_NO_RETURN #undef JSON_HEDLEY_NO_RETURN
#undef JSON_HEDLEY_NO_THROW #undef JSON_HEDLEY_NO_THROW
#undef JSON_HEDLEY_NULL #undef JSON_HEDLEY_NULL
...@@ -112,6 +113,18 @@ ...@@ -112,6 +113,18 @@
#undef JSON_HEDLEY_SUNPRO_VERSION_CHECK #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
#undef JSON_HEDLEY_TINYC_VERSION #undef JSON_HEDLEY_TINYC_VERSION
#undef JSON_HEDLEY_TINYC_VERSION_CHECK #undef JSON_HEDLEY_TINYC_VERSION_CHECK
#undef JSON_HEDLEY_TI_ARMCL_VERSION
#undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
#undef JSON_HEDLEY_TI_CL2000_VERSION
#undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
#undef JSON_HEDLEY_TI_CL430_VERSION
#undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
#undef JSON_HEDLEY_TI_CL6X_VERSION
#undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
#undef JSON_HEDLEY_TI_CL7X_VERSION
#undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
#undef JSON_HEDLEY_TI_CLPRU_VERSION
#undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
#undef JSON_HEDLEY_TI_VERSION #undef JSON_HEDLEY_TI_VERSION
#undef JSON_HEDLEY_TI_VERSION_CHECK #undef JSON_HEDLEY_TI_VERSION_CHECK
#undef JSON_HEDLEY_UNAVAILABLE #undef JSON_HEDLEY_UNAVAILABLE
...@@ -126,3 +139,5 @@ ...@@ -126,3 +139,5 @@
#undef JSON_HEDLEY_VERSION_ENCODE #undef JSON_HEDLEY_VERSION_ENCODE
#undef JSON_HEDLEY_WARNING #undef JSON_HEDLEY_WARNING
#undef JSON_HEDLEY_WARN_UNUSED_RESULT #undef JSON_HEDLEY_WARN_UNUSED_RESULT
#undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
#undef JSON_HEDLEY_FALL_THROUGH
This diff is collapsed.
...@@ -234,3 +234,46 @@ TEST_CASE("controlled bad_alloc") ...@@ -234,3 +234,46 @@ TEST_CASE("controlled bad_alloc")
} }
} }
} }
namespace
{
template<class T>
struct allocator_no_forward : std::allocator<T>
{
allocator_no_forward() {}
template <class U>
allocator_no_forward(allocator_no_forward<U>) {}
template <class U>
struct rebind
{
using other = allocator_no_forward<U>;
};
template <class... Args>
void construct(T* p, const Args& ... args)
{
// force copy even if move is available
::new (static_cast<void*>(p)) T(args...);
}
};
}
TEST_CASE("bad my_allocator::construct")
{
SECTION("my_allocator::construct doesn't forward")
{
using bad_alloc_json = nlohmann::basic_json<std::map,
std::vector,
std::string,
bool,
std::int64_t,
std::uint64_t,
double,
allocator_no_forward>;
bad_alloc_json json;
json["test"] = bad_alloc_json::array_t();
json["test"].push_back("should not leak");
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment