tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update third-party/nlohmann_json to v3.9.1 

the latest version w/o Apache 2.0 licensed code which conflicts with GPL 2.
This commit is contained in:
Alexander A. Klimov 2022-08-12 14:41:44 +02:00
parent e074e892ce
commit 34d0b942b9
3 changed files with 6164 additions and 3583 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/base/json.cpp
View File

@ -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
View File

@ -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
View File

File diff suppressed because it is too large Load Diff