update json.hpp to 3.1.0

This commit is contained in:
badaix 2018-02-06 22:38:45 +01:00
parent 84b03c98af
commit 6bbcc83cb1
11 changed files with 17184 additions and 10073 deletions

View file

@ -28,14 +28,10 @@
#include "streamUri.h"
#include "encoder/encoder.h"
#include "common/sampleFormat.h"
#include "common/json.hpp"
#include "message/codecHeader.h"
#include "message/streamTags.h"
#ifdef HAS_JSONRPCPP
#include <jsonrpcpp/json.hpp>
#else
#include "externals/json.hpp"
#endif
class PcmStream;

View file

@ -22,11 +22,8 @@
#include <string>
#include <map>
#ifdef HAS_JSONRPCPP
#include <jsonrpcpp/json.hpp>
#else
#include "externals/json.hpp"
#endif
#include "common/json.hpp"
using json = nlohmann::json;