From 803c16e5af4ff173b00684e758f8487bf1c8b0ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agust=C3=ADn=20F=2E=20Pozuelo?= Date: Fri, 3 Jul 2020 10:26:05 +0100 Subject: [PATCH] Clean-up unintended changes to whitespace --- .gitignore | 4 ---- doc/mkdocs/docs/features/types.md | 2 +- single_include/nlohmann/json.hpp | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4a39c874..bec7f598 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/doc/mkdocs/docs/features/types.md b/doc/mkdocs/docs/features/types.md index 211595e5..94e40cba 100644 --- a/doc/mkdocs/docs/features/types.md +++ b/doc/mkdocs/docs/features/types.md @@ -89,7 +89,7 @@ From the template arguments, the following types are derived: ```cpp using object_comparator_t = std::less<>; using object_t = ObjectType>>; + AllocatorType>>; using array_t = ArrayType>; diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 850ee6ab..a944799c 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -24536,7 +24536,7 @@ template<> inline void swap(nlohmann::json& j1, nlohmann::json& j2) noexcept( is_nothrow_move_constructible::value and is_nothrow_move_assignable::value - ) +) { j1.swap(j2); }