External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

single include changes

Browse Source
This commit is contained in:
Alex Fishgait 2023-10-10 11:36:23 +02:00
parent 519f972fc4
commit 453c8c24d7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
single_include/nlohmann/json.hpp
View File

@ -6068,6 +6068,7 @@ NLOHMANN_JSON_NAMESPACE_END
#include <string> // char_traits, string #include <string> // char_traits, string
#include <utility> // make_pair, move #include <utility> // make_pair, move
#include <vector> // vector #include <vector> // vector
#include <memory>
// #include <nlohmann/detail/exceptions.hpp> // #include <nlohmann/detail/exceptions.hpp>
@ -6581,6 +6582,7 @@ NLOHMANN_JSON_NAMESPACE_END
#include <string> // string #include <string> // string
#include <utility> // move #include <utility> // move
#include <vector> // vector #include <vector> // vector
#include <memory>
// #include <nlohmann/detail/exceptions.hpp> // #include <nlohmann/detail/exceptions.hpp>
@ -7318,6 +7320,7 @@ NLOHMANN_JSON_NAMESPACE_END
#include <string> // char_traits, string #include <string> // char_traits, string
#include <utility> // move #include <utility> // move
#include <vector> // vector #include <vector> // vector
#include <memory>
// #include <nlohmann/detail/input/input_adapters.hpp> // #include <nlohmann/detail/input/input_adapters.hpp>

6
tests/src/unit-allocator.cpp
View File

@ -283,7 +283,7 @@ struct NAlloc
}; };
NAlloc() : NAlloc() :
alloc(),m_alloc_size(0) alloc(), m_alloc_size(0)
{ {
} }
@ -292,7 +292,7 @@ struct NAlloc
pointer allocate(std::size_t n) pointer allocate(std::size_t n)
{ {
return static_cast<pointer>(alloc.allocate(n)); // get memory from pool return static_cast<pointer>(alloc.allocate(n)); // get memory from pool
} }
void deallocate(pointer p, std::size_t n) void deallocate(pointer p, std::size_t n)
@ -342,7 +342,7 @@ TEST_CASE("controlled bad_alloc_rt_string")
SECTION("json_value(value_t)") SECTION("json_value(value_t)")
{ {
SECTION("string") SECTION("string")
{ {
next_construct_fails = false; next_construct_fails = false;