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

Fix wrong rapidjson include on Appveyor

Browse source
This commit is contained in:
Gioacchino Mazzurco 2019-11-28 01:33:17 +01:00
parent 516b5e7a83
commit 3bb42ca799
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
5 changed files with 7 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,12 +32,7 @@
#include <iomanip>
#include <string>
#include <typeinfo> // for typeid
#ifdef HAS_RAPIDJSON
#include <rapidjson/prettywriter.h>
#else
#include <rapid_json/prettywriter.h>
#endif // HAS_RAPIDJSON
static constexpr uint32_t MAX_SERIALIZED_CHUNK_SIZE = 10*1024*1024 ; // 10 MB.

3
libretroshare/src/use_libretroshare.pri
View file

@ -38,11 +38,10 @@ bitdht {
# always possible to find them
RAPIDJSON_AVAILABLE = $$system(pkg-config --atleast-version 1.1 RapidJSON && echo yes)
isEmpty(RAPIDJSON_AVAILABLE) {
message("using built-in rapidjson")
message("using rapidjson from submodule")
INCLUDEPATH *= $$clean_path($${PWD}/../../supportlibs/rapidjson/include)
} else {
message("using system rapidjson")
DEFINES *= HAS_RAPIDJSON
}

15
libretroshare/src/util/rsjson.cc
View file

@ -19,19 +19,12 @@
* *
*******************************************************************************/
#include <rapidjson/writer.h>
#include <rapidjson/stringbuffer.h>
#include <rapidjson/prettywriter.h>
#include "util/rsjson.h"
#ifdef HAS_RAPIDJSON
# include <rapidjson/writer.h>
# include <rapidjson/stringbuffer.h>
# include <rapidjson/prettywriter.h>
#else
# include <rapid_json/writer.h>
# include <rapid_json/stringbuffer.h>
# include <rapid_json/prettywriter.h>
#endif // HAS_RAPIDJSON
inline int getJsonManipulatorStatePosition()
{
static int p = std::ios_base::xalloc();

7
libretroshare/src/util/rsjson.h
View file

@ -21,12 +21,7 @@
#pragma once
#include <iostream>
#ifdef HAS_RAPIDJSON
# include <rapidjson/document.h>
#else
# include <rapid_json/document.h>
#endif // HAS_RAPIDJSON
#include <rapidjson/document.h>
/**
* Use this type for JSON documents representations in RetroShare code