Commit f02adff4 authored by GitHub Actions's avatar GitHub Actions
Browse files

Upstream release v3.6.0

parent 292370c1

README.md

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ include(FetchContent) 


FetchContent_Declare(json

  GIT_REPOSITORY https://github.com/ArthurSonzogni/nlohman_json

  GIT_TAG v3.5.0)

  GIT_TAG v3.6.0)



FetchContent_GetProperties(json)

if(NOT json_POPULATED)

include/nlohmann/json.hpp

+9703 −9269

File changed.

Preview size limit exceeded, changes collapsed.

include/nlohmann/json_fwd.hpp

+3 −3
Original line number Diff line number Diff line 
#ifndef NLOHMANN_JSON_FWD_HPP

#define NLOHMANN_JSON_FWD_HPP

#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_

#define INCLUDE_NLOHMANN_JSON_FWD_HPP_



#include <cstdint> // int64_t, uint64_t

#include <map> // map
@@ -61,4 +61,4 @@ uses the standard template types. 
using json = basic_json<>;

}  // namespace nlohmann



#endif
 
#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_