Clean-up unintended changes to whitespace
This commit is contained in:
parent
25f5d75e6e
commit
803c16e5af
3 changed files with 2 additions and 6 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -25,11 +25,7 @@ benchmarks/files/numbers/*.json
|
|||
cmake-build-debug
|
||||
|
||||
test/test-*
|
||||
test/test_data.hpp
|
||||
Temporary
|
||||
|
||||
/.vs
|
||||
.vscode
|
||||
|
||||
doc/mkdocs/venv/
|
||||
doc/mkdocs/docs/images
|
||||
|
|
|
@ -89,7 +89,7 @@ From the template arguments, the following types are derived:
|
|||
```cpp
|
||||
using object_comparator_t = std::less<>;
|
||||
using object_t = ObjectType<StringType, basic_json, object_comparator_t,
|
||||
AllocatorType<std::pair<const StringType, basic_json>>>;
|
||||
AllocatorType<std::pair<const StringType, basic_json>>>;
|
||||
|
||||
using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
|
||||
|
||||
|
|
|
@ -24536,7 +24536,7 @@ template<>
|
|||
inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept(
|
||||
is_nothrow_move_constructible<nlohmann::json>::value and
|
||||
is_nothrow_move_assignable<nlohmann::json>::value
|
||||
)
|
||||
)
|
||||
{
|
||||
j1.swap(j2);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue