Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 14:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

added rapidjson-1.1.0 code hard-coded in the source directory to allow everyone to compile without the need to tweak too much. When v1.1.0 is mainstream (espcially on ubuntu) we can revert back to an external dependency

Browse source
This commit is contained in:
csoler 2018-05-02 22:46:27 +02:00
parent 48c4b4c4f8
commit 8e111c2ee2
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
41 changed files with 14593 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/serialiser/rsserializer.h
View file

@ -154,7 +154,7 @@
#include <string.h>
#include <iostream>
#include <string>
#include <rapidjson/document.h>
#include <rapid_json/document.h>
#include "retroshare/rsflags.h"
#include "serialiser/rsserial.h"

4
libretroshare/src/serialiser/rstypeserializer.cc
View file

@ -36,8 +36,8 @@
#include <string>
#include <typeinfo> // for typeid
#include <rapidjson/document.h>
#include <rapidjson/prettywriter.h>
#include <rapid_json/document.h>
#include <rapid_json/prettywriter.h>
//static const uint32_t MAX_SERIALIZED_ARRAY_SIZE = 500 ;
static const uint32_t MAX_SERIALIZED_CHUNK_SIZE = 10*1024*1024 ; // 10 MB.

2
libretroshare/src/serialiser/rstypeserializer.h
View file

@ -35,7 +35,7 @@
#include "serialiser/rsserializer.h"
#include "serialiser/rsserializable.h"
#include <rapidjson/document.h>
#include <rapid_json/document.h>
#include <typeinfo> // for typeid
#include <type_traits>
#include <errno.h>