From fad14aabe7b69c860cfca541253926ff46c85ff8 Mon Sep 17 00:00:00 2001
From: Niels Lohmann <mail@nlohmann.me>
Date: Sat, 25 Jul 2020 14:41:06 +0200
Subject: [PATCH] :memo: update output of meta function
---
doc/examples/meta.output | 4 ++--
include/nlohmann/json.hpp | 2 +-
single_include/nlohmann/json.hpp | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/examples/meta.output b/doc/examples/meta.output
index aa47599b..eb66a35f 100644
--- a/doc/examples/meta.output
+++ b/doc/examples/meta.output
@@ -2,9 +2,9 @@
"compiler": {
"c++": "201103",
"family": "clang",
- "version": "11.0.3 (clang-1103.0.32.62)"
+ "version": "12.0.0 (clang-1200.0.22.19)"
},
- "copyright": "(C) 2013-2017 Niels Lohmann",
+ "copyright": "(C) 2013-2020 Niels Lohmann",
"name": "JSON for Modern C++",
"platform": "apple",
"url": "https://github.com/nlohmann/json",
diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
index b4da4887..96526d17 100644
--- a/include/nlohmann/json.hpp
+++ b/include/nlohmann/json.hpp
@@ -344,7 +344,7 @@ class basic_json
{
basic_json result;
- result["copyright"] = "(C) 2013-2017 Niels Lohmann";
+ result["copyright"] = "(C) 2013-2020 Niels Lohmann";
result["name"] = "JSON for Modern C++";
result["url"] = "https://github.com/nlohmann/json";
result["version"]["string"] =
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
index f08967ce..3212fd4c 100644
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -16501,7 +16501,7 @@ class basic_json
detail::parser_callback_t<basic_json>cb = nullptr,
const bool allow_exceptions = true,
const bool ignore_comments = false
- )
+ )
{
return ::nlohmann::detail::parser<basic_json, InputAdapterType>(std::move(adapter),
std::move(cb), allow_exceptions, ignore_comments);
@@ -16647,7 +16647,7 @@ class basic_json
{
basic_json result;
- result["copyright"] = "(C) 2013-2017 Niels Lohmann";
+ result["copyright"] = "(C) 2013-2020 Niels Lohmann";
result["name"] = "JSON for Modern C++";
result["url"] = "https://github.com/nlohmann/json";
result["version"]["string"] =
@@ -25041,7 +25041,7 @@ template<>
inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept(
is_nothrow_move_constructible<nlohmann::json>::value&&
is_nothrow_move_assignable<nlohmann::json>::value
-)
+ )
{
j1.swap(j2);
}