j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge upstream commits and resolve conflicts

Browse source
This commit is contained in:
Trevor Welsby 2016-01-25 01:15:13 +10:00
commit 12ef668335
4 changed files with 8 additions and 1 deletions

3
src/json.hpp
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>