cleanup
This commit is contained in:
parent
73632377bf
commit
746c1a7142
4 changed files with 4 additions and 3 deletions
|
@ -379,6 +379,7 @@ I deeply appreciate the help of the following people.
|
||||||
- [Colin Hirsch](https://github.com/ColinH) took care of a small namespace issue.
|
- [Colin Hirsch](https://github.com/ColinH) took care of a small namespace issue.
|
||||||
- [Huu Nguyen](https://github.com/whoshuu) correct a variable name in the documentation.
|
- [Huu Nguyen](https://github.com/whoshuu) correct a variable name in the documentation.
|
||||||
- [Silverweed](https://github.com/silverweed) overloaded `parse()` to accept an rvalue reference.
|
- [Silverweed](https://github.com/silverweed) overloaded `parse()` to accept an rvalue reference.
|
||||||
|
- [dariomt](https://github.com/dariomt) fixed a subtlety in MSVC type support.
|
||||||
|
|
||||||
Thanks a lot for helping out!
|
Thanks a lot for helping out!
|
||||||
|
|
||||||
|
|
|
@ -586,7 +586,7 @@ class basic_json
|
||||||
private:
|
private:
|
||||||
/// helper for exception-safe object creation
|
/// helper for exception-safe object creation
|
||||||
template<typename T, typename... Args>
|
template<typename T, typename... Args>
|
||||||
static T* create( Args&& ... args )
|
static T* create(Args&& ... args)
|
||||||
{
|
{
|
||||||
AllocatorType<T> alloc;
|
AllocatorType<T> alloc;
|
||||||
auto deleter = [&](T * object)
|
auto deleter = [&](T * object)
|
||||||
|
|
|
@ -589,7 +589,7 @@ class basic_json
|
||||||
static T* create(Args&& ... args)
|
static T* create(Args&& ... args)
|
||||||
{
|
{
|
||||||
AllocatorType<T> alloc;
|
AllocatorType<T> alloc;
|
||||||
auto deleter = [&](T* object)
|
auto deleter = [&](T * object)
|
||||||
{
|
{
|
||||||
alloc.deallocate(object, 1);
|
alloc.deallocate(object, 1);
|
||||||
};
|
};
|
||||||
|
|
|
@ -9228,7 +9228,7 @@ TEST_CASE("concepts")
|
||||||
|
|
||||||
SECTION("CopyAssignable")
|
SECTION("CopyAssignable")
|
||||||
{
|
{
|
||||||
// STL iterators used by json::iterator don't pass this test in Debug mode
|
// STL iterators used by json::iterator don't pass this test in Debug mode
|
||||||
#if !defined(_MSC_VER) || (_ITERATOR_DEBUG_LEVEL == 0)
|
#if !defined(_MSC_VER) || (_ITERATOR_DEBUG_LEVEL == 0)
|
||||||
CHECK(std::is_nothrow_copy_assignable<json::iterator>::value);
|
CHECK(std::is_nothrow_copy_assignable<json::iterator>::value);
|
||||||
CHECK(std::is_nothrow_copy_assignable<json::const_iterator>::value);
|
CHECK(std::is_nothrow_copy_assignable<json::const_iterator>::value);
|
||||||
|
|
Loading…
Reference in a new issue