amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-22 22:08:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream commits and resolve conflicts

Browse Source
This commit is contained in:
Trevor Welsby committed 2016-01-25 01:15:13 +10:00
2 parents d7ef2ccffd 8b6e0dc02d
commit 12ef668335
4 files changed
+8 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/json.hpp
+3
View File
@@ -43,7 +43,9 @@ Class @ref nlohmann::basic_json is a good entry point for the documentation.
#include <cassert>
#include <ciso646>
#include <cmath>
#include <cstddef>
#include <cstdio>
#include <cstdlib>
#include <functional>
#include <initializer_list>
#include <iomanip>
@@ -53,6 +55,7 @@ Class @ref nlohmann::basic_json is a good entry point for the documentation.
#include <map>
#include <memory>
#include <sstream>
#include <stdexcept>
#include <string>
#include <type_traits>
#include <utility>
src/json.hpp.re2c
+3
View File
@@ -43,7 +43,9 @@ Class @ref nlohmann::basic_json is a good entry point for the documentation.
#include <cassert>
#include <ciso646>
#include <cmath>
#include <cstddef>
#include <cstdio>
#include <cstdlib>
#include <functional>
#include <initializer_list>
#include <iomanip>
@@ -53,6 +55,7 @@ Class @ref nlohmann::basic_json is a good entry point for the documentation.
#include <map>
#include <memory>
#include <sstream>
#include <stdexcept>
#include <string>
#include <type_traits>
#include <utility>