mirror of
https://github.com/Icinga/icinga2.git
synced 2025-07-23 21:55:03 +02:00
Merge pull request #9675 from Icinga/third-party/nlohmann_json
Update third-party/nlohmann_json to v3.9.1
This commit is contained in:
commit
d9767cff3f
@ -27,6 +27,7 @@ public:
|
|||||||
bool number_unsigned(number_unsigned_t val) override;
|
bool number_unsigned(number_unsigned_t val) override;
|
||||||
bool number_float(number_float_t val, const string_t& s) override;
|
bool number_float(number_float_t val, const string_t& s) override;
|
||||||
bool string(string_t& val) override;
|
bool string(string_t& val) override;
|
||||||
|
bool binary(binary_t& val) override;
|
||||||
bool start_object(std::size_t elements) override;
|
bool start_object(std::size_t elements) override;
|
||||||
bool key(string_t& val) override;
|
bool key(string_t& val) override;
|
||||||
bool end_object() override;
|
bool end_object() override;
|
||||||
@ -264,6 +265,14 @@ bool JsonSax::string(JsonSax::string_t& val)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline
|
||||||
|
bool JsonSax::binary(JsonSax::binary_t& val)
|
||||||
|
{
|
||||||
|
FillCurrentTarget(String(val.begin(), val.end()));
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
inline
|
inline
|
||||||
bool JsonSax::start_object(std::size_t)
|
bool JsonSax::start_object(std::size_t)
|
||||||
{
|
{
|
||||||
|
2
third-party/nlohmann_json/LICENSE
vendored
2
third-party/nlohmann_json/LICENSE
vendored
@ -1,6 +1,6 @@
|
|||||||
MIT License
|
MIT License
|
||||||
|
|
||||||
Copyright (c) 2013-2018 Niels Lohmann
|
Copyright (c) 2013-2020 Niels Lohmann
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
9736
third-party/nlohmann_json/json.hpp
vendored
9736
third-party/nlohmann_json/json.hpp
vendored
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user