Add 3rdparty prefix to all rapidjson includes.

src/base/api/interfaces/IApiRequest.h

@@ -26,7 +26,7 @@
 #define XMRIG_IAPIREQUEST_H
 
 
-#include "rapidjson/fwd.h"
+#include "3rdparty/rapidjson/fwd.h"
 
 
 namespace xmrig {

src/base/api/requests/HttpApiRequest.cpp

@@ -23,11 +23,11 @@
  */
 
 
-#include "3rdparty/http-parser/http_parser.h"
 #include "base/api/requests/HttpApiRequest.h"
+#include "3rdparty/http-parser/http_parser.h"
+#include "3rdparty/rapidjson/error/en.h"
 #include "base/io/json/Json.h"
 #include "base/net/http/HttpData.h"
-#include "rapidjson/error/en.h"
 
 
 namespace xmrig {

src/base/crypto/Algorithm.cpp

@@ -25,7 +25,7 @@
 
 
 #include "base/crypto/Algorithm.h"
-#include "rapidjson/document.h"
+#include "3rdparty/rapidjson/document.h"
 
 
 #include <cassert>

src/base/crypto/Algorithm.h

@@ -30,7 +30,7 @@
 #include <vector>
 
 
-#include "rapidjson/fwd.h"
+#include "3rdparty/rapidjson/fwd.h"
 
 
 namespace xmrig {

src/base/crypto/Coin.cpp

@@ -25,7 +25,7 @@
 
 
 #include "base/crypto/Coin.h"
-#include "rapidjson/document.h"
+#include "3rdparty/rapidjson/document.h"
 
 
 #include <cstring>

src/base/crypto/Coin.h

@@ -27,8 +27,8 @@
 #define XMRIG_COIN_H
 
 
+#include "3rdparty/rapidjson/fwd.h"
 #include "base/crypto/Algorithm.h"
-#include "rapidjson/fwd.h"
 
 
 namespace xmrig {

src/base/io/json/Json.cpp

@@ -24,7 +24,7 @@
 
 
 #include "base/io/json/Json.h"
-#include "rapidjson/document.h"
+#include "3rdparty/rapidjson/document.h"
 
 
 #include <cassert>

src/base/io/json/Json.h

@@ -26,8 +26,8 @@
 #define XMRIG_JSON_H
 
 
+#include "3rdparty/rapidjson/fwd.h"
 #include "base/kernel/interfaces/IJsonReader.h"
-#include "rapidjson/fwd.h"
 
 
 namespace xmrig {

src/base/io/json/JsonChain.cpp

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -23,10 +23,10 @@
  */
 
 
-#include "base/io/json/Json.h"
 #include "base/io/json/JsonChain.h"
+#include "3rdparty/rapidjson/error/en.h"
+#include "base/io/json/Json.h"
 #include "base/io/log/Log.h"
-#include "rapidjson/error/en.h"
 
 
 namespace xmrig {

src/base/io/json/JsonChain.h

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -29,9 +29,9 @@
 #include <vector>
 
 
+#include "3rdparty/rapidjson/document.h"
 #include "base/kernel/interfaces/IJsonReader.h"
 #include "base/tools/String.h"
-#include "rapidjson/document.h"
 
 
 namespace xmrig {

src/base/io/json/JsonRequest.cpp

@@ -24,7 +24,7 @@
 
 
 #include "base/io/json/JsonRequest.h"
-#include "rapidjson/document.h"
+#include "3rdparty/rapidjson/document.h"
 
 
 namespace xmrig {

src/base/io/json/JsonRequest.h

@@ -26,7 +26,7 @@
 #define XMRIG_JSONREQUEST_H
 
 
-#include "rapidjson/fwd.h"
+#include "3rdparty/rapidjson/fwd.h"
 
 
 namespace xmrig {

src/base/io/json/Json_unix.cpp

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -27,10 +27,10 @@
 
 
 #include "base/io/json/Json.h"
-#include "rapidjson/document.h"
-#include "rapidjson/istreamwrapper.h"
-#include "rapidjson/ostreamwrapper.h"
-#include "rapidjson/prettywriter.h"
+#include "3rdparty/rapidjson/document.h"
+#include "3rdparty/rapidjson/istreamwrapper.h"
+#include "3rdparty/rapidjson/ostreamwrapper.h"
+#include "3rdparty/rapidjson/prettywriter.h"
 
 
 bool xmrig::Json::get(const char *fileName, rapidjson::Document &doc)

src/base/io/json/Json_win.cpp

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -37,10 +37,10 @@
 
 
 #include "base/io/json/Json.h"
-#include "rapidjson/document.h"
-#include "rapidjson/istreamwrapper.h"
-#include "rapidjson/ostreamwrapper.h"
-#include "rapidjson/prettywriter.h"
+#include "3rdparty/rapidjson/document.h"
+#include "3rdparty/rapidjson/istreamwrapper.h"
+#include "3rdparty/rapidjson/ostreamwrapper.h"
+#include "3rdparty/rapidjson/prettywriter.h"
 
 
 #if defined(_MSC_VER) || defined (__GNUC__)

src/base/kernel/Base.h

@@ -26,11 +26,11 @@
 #define XMRIG_BASE_H
 
 
+#include "3rdparty/rapidjson/fwd.h"
 #include "base/api/interfaces/IApiListener.h"
 #include "base/kernel/interfaces/IConfigListener.h"
 #include "base/kernel/interfaces/IWatcherListener.h"
 #include "base/tools/Object.h"
-#include "rapidjson/fwd.h"
 
 
 namespace xmrig {

src/base/kernel/config/BaseConfig.cpp

@@ -24,10 +24,10 @@
 
 
 #include "base/kernel/config/BaseConfig.h"
+#include "3rdparty/rapidjson/document.h"
 #include "base/io/json/Json.h"
 #include "base/io/log/Log.h"
 #include "base/kernel/interfaces/IJsonReader.h"
-#include "rapidjson/document.h"
 #include "version.h"
 
 

src/base/kernel/config/BaseTransform.h

@@ -26,9 +26,9 @@
 #define XMRIG_BASETRANSFORM_H
 
 
+#include "3rdparty/rapidjson/document.h"
 #include "base/crypto/Coin.h"
 #include "base/kernel/interfaces/IConfigTransform.h"
-#include "rapidjson/document.h"
 
 
 struct option;

src/base/kernel/interfaces/IClient.h

@@ -26,7 +26,7 @@
 #define XMRIG_ICLIENT_H
 
 
-#include "rapidjson/fwd.h"
+#include "3rdparty/rapidjson/fwd.h"
 
 
 #include <functional>

src/base/kernel/interfaces/IClientListener.h

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
 #include <cstdint>
 
 
-#include "rapidjson/fwd.h"
+#include "3rdparty/rapidjson/fwd.h"
 
 
 namespace xmrig {

src/base/kernel/interfaces/IConfig.h

@@ -26,7 +26,7 @@
 #define XMRIG_ICONFIG_H
 
 
-#include "rapidjson/fwd.h"
+#include "3rdparty/rapidjson/fwd.h"
 
 
 namespace xmrig {

src/base/kernel/interfaces/IConfigTransform.h

@@ -26,7 +26,7 @@
 #define XMRIG_ICONFIGTRANSFORM_H
 
 
-#include "rapidjson/fwd.h"
+#include "3rdparty/rapidjson/fwd.h"
 
 
 namespace xmrig {

src/base/kernel/interfaces/IJsonReader.h

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 #define XMRIG_IJSONREADER_H
 
 
-#include "rapidjson/fwd.h"
+#include "3rdparty/rapidjson/fwd.h"
 
 
 namespace xmrig {

src/base/kernel/interfaces/IStrategyListener.h

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 #define XMRIG_ISTRATEGYLISTENER_H
 
 
-#include "rapidjson/fwd.h"
+#include "3rdparty/rapidjson/fwd.h"
 
 
 namespace xmrig {

src/base/net/http/HttpApiResponse.cpp

@@ -26,9 +26,9 @@
 
 #include "base/net/http/HttpApiResponse.h"
 #include "3rdparty/http-parser/http_parser.h"
+#include "3rdparty/rapidjson/prettywriter.h"
+#include "3rdparty/rapidjson/stringbuffer.h"
 #include "base/net/http/HttpData.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/stringbuffer.h"
 
 
 namespace xmrig {

src/base/net/http/HttpApiResponse.h

@@ -28,8 +28,8 @@
 #define XMRIG_HTTPAPIRESPONSE_H
 
 
+#include "3rdparty/rapidjson/document.h"
 #include "base/net/http/HttpResponse.h"
-#include "rapidjson/document.h"
 
 
 namespace xmrig {

src/base/net/stratum/Client.cpp

@@ -39,6 +39,10 @@
 
 
 #include "base/net/stratum/Client.h"
+#include "3rdparty/rapidjson/document.h"
+#include "3rdparty/rapidjson/error/en.h"
+#include "3rdparty/rapidjson/stringbuffer.h"
+#include "3rdparty/rapidjson/writer.h"
 #include "base/io/json/Json.h"
 #include "base/io/json/JsonRequest.h"
 #include "base/io/log/Log.h"
@@ -49,10 +53,6 @@
 #include "base/tools/Buffer.h"
 #include "base/tools/Chrono.h"
 #include "net/JobResult.h"
-#include "rapidjson/document.h"
-#include "rapidjson/error/en.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/writer.h"
 
 
 #ifdef _MSC_VER

src/base/net/stratum/DaemonClient.cpp

@@ -26,6 +26,8 @@
 
 #include "base/net/stratum/DaemonClient.h"
 #include "3rdparty/http-parser/http_parser.h"
+#include "3rdparty/rapidjson/document.h"
+#include "3rdparty/rapidjson/error/en.h"
 #include "base/io/json/Json.h"
 #include "base/io/json/JsonRequest.h"
 #include "base/io/log/Log.h"
@@ -36,8 +38,6 @@
 #include "base/tools/Buffer.h"
 #include "base/tools/Timer.h"
 #include "net/JobResult.h"
-#include "rapidjson/document.h"
-#include "rapidjson/error/en.h"
 
 
 #include <algorithm>

src/base/net/stratum/NetworkState.cpp

@@ -24,13 +24,13 @@
 
 
 #include "base/net/stratum/NetworkState.h"
+#include "3rdparty/rapidjson/document.h"
 #include "base/kernel/interfaces/IClient.h"
 #include "base/kernel/interfaces/IStrategy.h"
 #include "base/net/stratum/Job.h"
 #include "base/net/stratum/Pool.h"
 #include "base/net/stratum/SubmitResult.h"
 #include "base/tools/Chrono.h"
-#include "rapidjson/document.h"
 
 
 #include <algorithm>

src/base/net/stratum/Pool.cpp

@@ -32,11 +32,11 @@
 
 
 #include "base/net/stratum/Pool.h"
+#include "3rdparty/rapidjson/document.h"
 #include "base/io/json/Json.h"
 #include "base/io/log/Log.h"
 #include "base/kernel/Platform.h"
 #include "base/net/stratum/Client.h"
-#include "rapidjson/document.h"
 
 
 #ifdef XMRIG_FEATURE_HTTP

src/base/net/stratum/Pool.h

@@ -31,9 +31,9 @@
 #include <vector>
 
 
+#include "3rdparty/rapidjson/fwd.h"
 #include "base/crypto/Coin.h"
 #include "base/net/stratum/ProxyUrl.h"
-#include "rapidjson/fwd.h"
 
 
 namespace xmrig {

src/base/net/stratum/Pools.cpp

@@ -24,12 +24,12 @@
 
 
 #include "base/net/stratum/Pools.h"
+#include "3rdparty/rapidjson/document.h"
 #include "base/io/log/Log.h"
 #include "base/kernel/interfaces/IJsonReader.h"
 #include "base/net/stratum/strategies/FailoverStrategy.h"
 #include "base/net/stratum/strategies/SinglePoolStrategy.h"
 #include "donate.h"
-#include "rapidjson/document.h"
 
 
 namespace xmrig {

src/base/net/stratum/ProxyUrl.cpp

@@ -18,7 +18,7 @@
 
 
 #include "base/net/stratum/ProxyUrl.h"
-#include "rapidjson/document.h"
+#include "3rdparty/rapidjson/document.h"
 
 
 namespace xmrig {

src/base/net/stratum/SelfSelectClient.cpp

@@ -26,14 +26,14 @@
 
 #include "base/net/stratum/SelfSelectClient.h"
 #include "3rdparty/http-parser/http_parser.h"
+#include "3rdparty/rapidjson/document.h"
+#include "3rdparty/rapidjson/error/en.h"
 #include "base/io/json/Json.h"
 #include "base/io/json/JsonRequest.h"
 #include "base/io/log/Log.h"
 #include "base/net/http/Fetch.h"
 #include "base/net/http/HttpData.h"
 #include "base/net/stratum/Client.h"
-#include "rapidjson/document.h"
-#include "rapidjson/error/en.h"
 
 
 namespace xmrig {