Skip to content

Commit 8ebada5

Browse files
chelseadzdrchelseadzdr
committed
Amalgamated with make amalgamate
Signed-off-by: chelseadzdr <[email protected]>
1 parent b71179f commit 8ebada5

File tree

2 files changed

+65
-65
lines changed

2 files changed

+65
-65
lines changed

‎include/nlohmann/detail/macro_scope.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@
666666
struct would_call_std_##std_name \
667667
{ \
668668
static constexpr auto const value = ::nlohmann::detail:: \
669-
is_detected_exact<std_name##_tag, result_of_##std_name, T...>::value; \
669+
is_detected_exact<std_name##_tag, result_of_##std_name, T...>::value; \
670670
}; \
671671
} /* namespace detail2 */ \
672672
\

‎single_include/nlohmann/json.hpp‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -3030,7 +3030,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP
30303030
struct would_call_std_##std_name \
30313031
{ \
30323032
static constexpr auto const value = ::nlohmann::detail:: \
3033-
is_detected_exact<std_name##_tag, result_of_##std_name, T...>::value; \
3033+
is_detected_exact<std_name##_tag, result_of_##std_name, T...>::value; \
30343034
}; \
30353035
} /* namespace detail2 */ \
30363036
\
@@ -3592,71 +3592,71 @@ NLOHMANN_JSON_NAMESPACE_END
35923592
// SPDX-License-Identifier: MIT
35933593

35943594
#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
3595-
#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
3595+
#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
35963596

3597-
#include <cstdint> // int64_t, uint64_t
3598-
#include <map> // map
3599-
#include <memory> // allocator
3600-
#include <string> // string
3601-
#include <vector> // vector
3602-
3603-
// #include <nlohmann/detail/abi_macros.hpp>
3597+
#include <cstdint> // int64_t, uint64_t
3598+
#include <map> // map
3599+
#include <memory> // allocator
3600+
#include <string> // string
3601+
#include <vector> // vector
36043602

3603+
// #include <nlohmann/detail/abi_macros.hpp>
36053604

3606-
/*!
3607-
@brief namespace for Niels Lohmann
3608-
@see https://github.com/nlohmann
3609-
@since version 1.0.0
3610-
*/
3611-
NLOHMANN_JSON_NAMESPACE_BEGIN
36123605

3613-
/*!
3614-
@brief default JSONSerializer template argument
3606+
/*!
3607+
@brief namespace for Niels Lohmann
3608+
@see https://github.com/nlohmann
3609+
@since version 1.0.0
3610+
*/
3611+
NLOHMANN_JSON_NAMESPACE_BEGIN
36153612

3616-
This serializer ignores the template arguments and uses ADL
3617-
([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
3618-
for serialization.
3619-
*/
3620-
template<typename T = void, typename SFINAE = void>
3621-
struct adl_serializer;
3622-
3623-
/// a class to store JSON values
3624-
/// @sa https://json.nlohmann.me/api/basic_json/
3625-
template<template<typename U, typename V, typename... Args> class ObjectType =
3626-
std::map,
3627-
template<typename U, typename... Args> class ArrayType = std::vector,
3628-
class StringType = std::string, class BooleanType = bool,
3629-
class NumberIntegerType = std::int64_t,
3630-
class NumberUnsignedType = std::uint64_t,
3631-
class NumberFloatType = double,
3632-
template<typename U> class AllocatorType = std::allocator,
3633-
template<typename T, typename SFINAE = void> class JSONSerializer =
3634-
adl_serializer,
3635-
class BinaryType = std::vector<std::uint8_t>, // cppcheck-suppress syntaxError
3636-
class CustomBaseClass = void>
3637-
class basic_json;
3613+
/*!
3614+
@brief default JSONSerializer template argument
36383615

3639-
/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
3640-
/// @sa https://json.nlohmann.me/api/json_pointer/
3641-
template<typename RefStringType>
3642-
class json_pointer;
3616+
This serializer ignores the template arguments and uses ADL
3617+
([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
3618+
for serialization.
3619+
*/
3620+
template<typename T = void, typename SFINAE = void>
3621+
struct adl_serializer;
3622+
3623+
/// a class to store JSON values
3624+
/// @sa https://json.nlohmann.me/api/basic_json/
3625+
template<template<typename U, typename V, typename... Args> class ObjectType =
3626+
std::map,
3627+
template<typename U, typename... Args> class ArrayType = std::vector,
3628+
class StringType = std::string, class BooleanType = bool,
3629+
class NumberIntegerType = std::int64_t,
3630+
class NumberUnsignedType = std::uint64_t,
3631+
class NumberFloatType = double,
3632+
template<typename U> class AllocatorType = std::allocator,
3633+
template<typename T, typename SFINAE = void> class JSONSerializer =
3634+
adl_serializer,
3635+
class BinaryType = std::vector<std::uint8_t>, // cppcheck-suppress syntaxError
3636+
class CustomBaseClass = void>
3637+
class basic_json;
3638+
3639+
/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
3640+
/// @sa https://json.nlohmann.me/api/json_pointer/
3641+
template<typename RefStringType>
3642+
class json_pointer;
36433643

3644-
/*!
3645-
@brief default specialization
3646-
@sa https://json.nlohmann.me/api/json/
3647-
*/
3648-
using json = basic_json<>;
3644+
/*!
3645+
@brief default specialization
3646+
@sa https://json.nlohmann.me/api/json/
3647+
*/
3648+
using json = basic_json<>;
36493649

3650-
/// @brief a minimal map-like container that preserves insertion order
3651-
/// @sa https://json.nlohmann.me/api/ordered_map/
3652-
template<class Key, class T, class IgnoredLess, class Allocator>
3653-
struct ordered_map;
3650+
/// @brief a minimal map-like container that preserves insertion order
3651+
/// @sa https://json.nlohmann.me/api/ordered_map/
3652+
template<class Key, class T, class IgnoredLess, class Allocator>
3653+
struct ordered_map;
36543654

3655-
/// @brief specialization that maintains the insertion order of object keys
3656-
/// @sa https://json.nlohmann.me/api/ordered_json/
3657-
using ordered_json = basic_json<nlohmann::ordered_map>;
3655+
/// @brief specialization that maintains the insertion order of object keys
3656+
/// @sa https://json.nlohmann.me/api/ordered_json/
3657+
using ordered_json = basic_json<nlohmann::ordered_map>;
36583658

3659-
NLOHMANN_JSON_NAMESPACE_END
3659+
NLOHMANN_JSON_NAMESPACE_END
36603660

36613661
#endif // INCLUDE_NLOHMANN_JSON_FWD_HPP_
36623662

@@ -5520,7 +5520,7 @@ NLOHMANN_JSON_NAMESPACE_END
55205520

55215521

55225522
// #include <nlohmann/detail/macro_scope.hpp>
5523-
// JSON_HAS_CPP_17
5523+
// JSON_HAS_CPP_17
55245524
#ifdef JSON_HAS_CPP_17
55255525
#include <optional> // optional
55265526
#endif
@@ -20348,10 +20348,10 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
2034820348
const bool allow_exceptions = true,
2034920349
const bool ignore_comments = false,
2035020350
const bool ignore_trailing_commas = false
20351-
)
20351+
)
2035220352
{
2035320353
return ::nlohmann::detail::parser<basic_json, InputAdapterType>(std::move(adapter),
20354-
std::move(cb), allow_exceptions, ignore_comments, ignore_trailing_commas);
20354+
std::move(cb), allow_exceptions, ignore_comments, ignore_trailing_commas);
2035520355
}
2035620356

2035720357
private:
@@ -21049,8 +21049,8 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
2104921049
detail::enable_if_t <
2105021050
!detail::is_basic_json<U>::value && detail::is_compatible_type<basic_json_t, U>::value, int > = 0 >
2105121051
basic_json(CompatibleType && val) noexcept(noexcept( // NOLINT(bugprone-forwarding-reference-overload,bugprone-exception-escape)
21052-
JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
21053-
std::forward<CompatibleType>(val))))
21052+
JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
21053+
std::forward<CompatibleType>(val))))
2105421054
{
2105521055
JSONSerializer<U>::to_json(*this, std::forward<CompatibleType>(val));
2105621056
set_parents();
@@ -21844,7 +21844,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
2184421844
detail::has_from_json<basic_json_t, ValueType>::value,
2184521845
int > = 0 >
2184621846
ValueType get_impl(detail::priority_tag<0> /*unused*/) const noexcept(noexcept(
21847-
JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
21847+
JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
2184821848
{
2184921849
auto ret = ValueType();
2185021850
JSONSerializer<ValueType>::from_json(*this, ret);
@@ -21886,7 +21886,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
2188621886
detail::has_non_default_from_json<basic_json_t, ValueType>::value,
2188721887
int > = 0 >
2188821888
ValueType get_impl(detail::priority_tag<1> /*unused*/) const noexcept(noexcept(
21889-
JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
21889+
JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
2189021890
{
2189121891
return JSONSerializer<ValueType>::from_json(*this);
2189221892
}
@@ -22036,7 +22036,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
2203622036
detail::has_from_json<basic_json_t, ValueType>::value,
2203722037
int > = 0 >
2203822038
ValueType & get_to(ValueType& v) const noexcept(noexcept(
22039-
JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
22039+
JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
2204022040
{
2204122041
JSONSerializer<ValueType>::from_json(*this, v);
2204222042
return v;

0 commit comments

Comments
 (0)