diff --git a/src/backend/common/Hashrate.cpp b/src/backend/common/Hashrate.cpp index eb01a5fb0..c7ef90fbf 100644 --- a/src/backend/common/Hashrate.cpp +++ b/src/backend/common/Hashrate.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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 @@ -30,10 +30,10 @@ #include "backend/common/Hashrate.h" +#include "3rdparty/rapidjson/document.h" #include "base/io/json/Json.h" #include "base/tools/Chrono.h" #include "base/tools/Handle.h" -#include "rapidjson/document.h" inline static const char *format(double h, char *buf, size_t size) diff --git a/src/backend/common/Hashrate.h b/src/backend/common/Hashrate.h index ba60d2adf..59e1afe1f 100644 --- a/src/backend/common/Hashrate.h +++ b/src/backend/common/Hashrate.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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 @@ -30,8 +30,8 @@ #include +#include "3rdparty/rapidjson/fwd.h" #include "base/tools/Object.h" -#include "rapidjson/fwd.h" namespace xmrig { diff --git a/src/backend/common/Threads.cpp b/src/backend/common/Threads.cpp index 4b23e85d2..920e7deff 100644 --- a/src/backend/common/Threads.cpp +++ b/src/backend/common/Threads.cpp @@ -24,9 +24,9 @@ #include "backend/common/Threads.h" +#include "3rdparty/rapidjson/document.h" #include "backend/cpu/CpuThreads.h" #include "crypto/cn/CnAlgo.h" -#include "rapidjson/document.h" #ifdef XMRIG_FEATURE_OPENCL diff --git a/src/backend/common/Threads.h b/src/backend/common/Threads.h index a21fe13b5..1682efbad 100644 --- a/src/backend/common/Threads.h +++ b/src/backend/common/Threads.h @@ -30,9 +30,9 @@ #include +#include "3rdparty/rapidjson/fwd.h" #include "base/crypto/Algorithm.h" #include "base/tools/String.h" -#include "rapidjson/fwd.h" namespace xmrig { diff --git a/src/backend/common/common.cmake b/src/backend/common/common.cmake index 9dd0fb3c1..03c37c8f7 100644 --- a/src/backend/common/common.cmake +++ b/src/backend/common/common.cmake @@ -4,7 +4,6 @@ set(HEADERS_BACKEND_COMMON src/backend/common/interfaces/IBackend.h src/backend/common/interfaces/IRxListener.h src/backend/common/interfaces/IRxStorage.h - src/backend/common/interfaces/IThread.h src/backend/common/interfaces/IWorker.h src/backend/common/misc/PciTopology.h src/backend/common/Thread.h diff --git a/src/backend/common/interfaces/IBackend.h b/src/backend/common/interfaces/IBackend.h index bdaf54635..405d876a7 100644 --- a/src/backend/common/interfaces/IBackend.h +++ b/src/backend/common/interfaces/IBackend.h @@ -29,7 +29,7 @@ #include -#include "rapidjson/fwd.h" +#include "3rdparty/rapidjson/fwd.h" namespace xmrig { diff --git a/src/backend/common/interfaces/IThread.h b/src/backend/common/interfaces/IThread.h deleted file mode 100644 index 3c0a7287a..000000000 --- a/src/backend/common/interfaces/IThread.h +++ /dev/null @@ -1,77 +0,0 @@ -/* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2016-2018 XMRig - * - * 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef XMRIG_ITHREAD_H -#define XMRIG_ITHREAD_H - - -#include - - -#include "crypto/common/Algorithm.h" -#include "rapidjson/fwd.h" - - -namespace xmrig { - - -class IThread -{ -public: - enum Type { - CPU, - OpenCL, - CUDA - }; - - enum Multiway { - SingleWay = 1, - DoubleWay, - TripleWay, - QuadWay, - PentaWay - }; - - virtual ~IThread() = default; - - virtual Algorithm algorithm() const = 0; - virtual int priority() const = 0; - virtual int64_t affinity() const = 0; - virtual Multiway multiway() const = 0; - virtual rapidjson::Value toConfig(rapidjson::Document &doc) const = 0; - virtual size_t index() const = 0; - virtual Type type() const = 0; - -# ifdef XMRIG_FEATURE_API - virtual rapidjson::Value toAPI(rapidjson::Document &doc) const = 0; -# endif - -# ifdef APP_DEBUG - virtual void print() const = 0; -# endif -}; - - -} /* namespace xmrig */ - - -#endif // XMRIG_ITHREAD_H diff --git a/src/backend/cpu/Cpu.cpp b/src/backend/cpu/Cpu.cpp index 1e3157773..a11c4c567 100644 --- a/src/backend/cpu/Cpu.cpp +++ b/src/backend/cpu/Cpu.cpp @@ -27,7 +27,7 @@ #include "backend/cpu/Cpu.h" -#include "rapidjson/document.h" +#include "3rdparty/rapidjson/document.h" #if defined(XMRIG_FEATURE_HWLOC) diff --git a/src/backend/cpu/CpuBackend.cpp b/src/backend/cpu/CpuBackend.cpp index 1efc1eafe..40b774d25 100644 --- a/src/backend/cpu/CpuBackend.cpp +++ b/src/backend/cpu/CpuBackend.cpp @@ -26,12 +26,13 @@ #include +#include "backend/cpu/CpuBackend.h" +#include "3rdparty/rapidjson/document.h" #include "backend/common/Hashrate.h" #include "backend/common/interfaces/IWorker.h" #include "backend/common/Tags.h" #include "backend/common/Workers.h" #include "backend/cpu/Cpu.h" -#include "backend/cpu/CpuBackend.h" #include "base/io/log/Log.h" #include "base/net/stratum/Job.h" #include "base/tools/Chrono.h" @@ -41,7 +42,6 @@ #include "crypto/common/VirtualMemory.h" #include "crypto/rx/Rx.h" #include "crypto/rx/RxDataset.h" -#include "rapidjson/document.h" #ifdef XMRIG_FEATURE_API diff --git a/src/backend/cpu/CpuConfig.cpp b/src/backend/cpu/CpuConfig.cpp index 4c7a630f6..ab966e701 100644 --- a/src/backend/cpu/CpuConfig.cpp +++ b/src/backend/cpu/CpuConfig.cpp @@ -24,10 +24,10 @@ #include "backend/cpu/CpuConfig.h" +#include "3rdparty/rapidjson/document.h" #include "backend/cpu/CpuConfig_gen.h" #include "backend/cpu/Cpu.h" #include "base/io/json/Json.h" -#include "rapidjson/document.h" #include diff --git a/src/backend/cpu/CpuThread.cpp b/src/backend/cpu/CpuThread.cpp index 660107fa6..4da1baf7f 100644 --- a/src/backend/cpu/CpuThread.cpp +++ b/src/backend/cpu/CpuThread.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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 @@ -24,8 +24,8 @@ #include "backend/cpu/CpuThread.h" +#include "3rdparty/rapidjson/document.h" #include "base/io/json/Json.h" -#include "rapidjson/document.h" xmrig::CpuThread::CpuThread(const rapidjson::Value &value) diff --git a/src/backend/cpu/CpuThread.h b/src/backend/cpu/CpuThread.h index 91d63a1c9..b198c8001 100644 --- a/src/backend/cpu/CpuThread.h +++ b/src/backend/cpu/CpuThread.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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_CPUTHREAD_H -#include "rapidjson/fwd.h" +#include "3rdparty/rapidjson/fwd.h" namespace xmrig { diff --git a/src/backend/cpu/CpuThreads.cpp b/src/backend/cpu/CpuThreads.cpp index 416b4ecbc..d9ae61b15 100644 --- a/src/backend/cpu/CpuThreads.cpp +++ b/src/backend/cpu/CpuThreads.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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,8 +27,8 @@ #include "backend/cpu/CpuThreads.h" +#include "3rdparty/rapidjson/document.h" #include "base/io/json/Json.h" -#include "rapidjson/document.h" namespace xmrig { diff --git a/src/backend/cpu/CpuThreads.h b/src/backend/cpu/CpuThreads.h index 076670cdd..e87f52306 100644 --- a/src/backend/cpu/CpuThreads.h +++ b/src/backend/cpu/CpuThreads.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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 diff --git a/src/backend/cuda/CudaBackend.cpp b/src/backend/cuda/CudaBackend.cpp index 25a773364..6004a83d2 100644 --- a/src/backend/cuda/CudaBackend.cpp +++ b/src/backend/cuda/CudaBackend.cpp @@ -28,6 +28,7 @@ #include "backend/cuda/CudaBackend.h" +#include "3rdparty/rapidjson/document.h" #include "backend/common/Hashrate.h" #include "backend/common/interfaces/IWorker.h" #include "backend/common/Tags.h" @@ -43,7 +44,6 @@ #include "base/tools/String.h" #include "core/config/Config.h" #include "core/Controller.h" -#include "rapidjson/document.h" #ifdef XMRIG_ALGO_ASTROBWT diff --git a/src/backend/cuda/CudaConfig.cpp b/src/backend/cuda/CudaConfig.cpp index 618aefa90..89e5237eb 100644 --- a/src/backend/cuda/CudaConfig.cpp +++ b/src/backend/cuda/CudaConfig.cpp @@ -24,12 +24,12 @@ #include "backend/cuda/CudaConfig.h" +#include "3rdparty/rapidjson/document.h" #include "backend/common/Tags.h" #include "backend/cuda/CudaConfig_gen.h" #include "backend/cuda/wrappers/CudaLib.h" #include "base/io/json/Json.h" #include "base/io/log/Log.h" -#include "rapidjson/document.h" namespace xmrig { diff --git a/src/backend/cuda/CudaThread.cpp b/src/backend/cuda/CudaThread.cpp index eb65dc2c4..fff58eaa9 100644 --- a/src/backend/cuda/CudaThread.cpp +++ b/src/backend/cuda/CudaThread.cpp @@ -24,9 +24,9 @@ #include "backend/cuda/CudaThread.h" +#include "3rdparty/rapidjson/document.h" #include "backend/cuda/wrappers/CudaLib.h" #include "base/io/json/Json.h" -#include "rapidjson/document.h" #include diff --git a/src/backend/cuda/CudaThread.h b/src/backend/cuda/CudaThread.h index 3588e846d..75110bfdc 100644 --- a/src/backend/cuda/CudaThread.h +++ b/src/backend/cuda/CudaThread.h @@ -29,7 +29,7 @@ using nvid_ctx = struct nvid_ctx; -#include "rapidjson/fwd.h" +#include "3rdparty/rapidjson/fwd.h" namespace xmrig { diff --git a/src/backend/cuda/CudaThreads.cpp b/src/backend/cuda/CudaThreads.cpp index 5ff4cb24b..b5696350e 100644 --- a/src/backend/cuda/CudaThreads.cpp +++ b/src/backend/cuda/CudaThreads.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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 @@ -24,8 +24,8 @@ #include "backend/cuda/CudaThreads.h" +#include "3rdparty/rapidjson/document.h" #include "base/io/json/Json.h" -#include "rapidjson/document.h" #include diff --git a/src/backend/cuda/CudaThreads.h b/src/backend/cuda/CudaThreads.h index 5f174d8eb..eb6d54ee2 100644 --- a/src/backend/cuda/CudaThreads.h +++ b/src/backend/cuda/CudaThreads.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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 diff --git a/src/backend/cuda/wrappers/CudaDevice.cpp b/src/backend/cuda/wrappers/CudaDevice.cpp index daa160745..f06fe9401 100644 --- a/src/backend/cuda/wrappers/CudaDevice.cpp +++ b/src/backend/cuda/wrappers/CudaDevice.cpp @@ -24,11 +24,12 @@ #include "backend/cuda/wrappers/CudaDevice.h" +#include "3rdparty/rapidjson/document.h" #include "backend/cuda/CudaThreads.h" #include "backend/cuda/wrappers/CudaLib.h" #include "base/crypto/Algorithm.h" #include "base/io/log/Log.h" -#include "rapidjson/document.h" + #ifdef XMRIG_FEATURE_NVML # include "backend/cuda/wrappers/NvmlLib.h" diff --git a/src/backend/opencl/OclBackend.cpp b/src/backend/opencl/OclBackend.cpp index 4b1a14bcf..2d431c323 100644 --- a/src/backend/opencl/OclBackend.cpp +++ b/src/backend/opencl/OclBackend.cpp @@ -28,6 +28,7 @@ #include "backend/opencl/OclBackend.h" +#include "3rdparty/rapidjson/document.h" #include "backend/common/Hashrate.h" #include "backend/common/interfaces/IWorker.h" #include "backend/common/Tags.h" @@ -45,7 +46,6 @@ #include "base/tools/String.h" #include "core/config/Config.h" #include "core/Controller.h" -#include "rapidjson/document.h" #ifdef XMRIG_FEATURE_API diff --git a/src/backend/opencl/OclConfig.cpp b/src/backend/opencl/OclConfig.cpp index b06746f3c..c05f36d45 100644 --- a/src/backend/opencl/OclConfig.cpp +++ b/src/backend/opencl/OclConfig.cpp @@ -24,12 +24,12 @@ #include "backend/opencl/OclConfig.h" +#include "3rdparty/rapidjson/document.h" #include "backend/common/Tags.h" #include "backend/opencl/OclConfig_gen.h" #include "backend/opencl/wrappers/OclLib.h" #include "base/io/json/Json.h" #include "base/io/log/Log.h" -#include "rapidjson/document.h" namespace xmrig { diff --git a/src/backend/opencl/OclThread.cpp b/src/backend/opencl/OclThread.cpp index b542b443f..087b2cf7e 100644 --- a/src/backend/opencl/OclThread.cpp +++ b/src/backend/opencl/OclThread.cpp @@ -24,8 +24,8 @@ #include "backend/opencl/OclThread.h" +#include "3rdparty/rapidjson/document.h" #include "base/io/json/Json.h" -#include "rapidjson/document.h" #include diff --git a/src/backend/opencl/OclThread.h b/src/backend/opencl/OclThread.h index dac57a4f1..fbdfe1779 100644 --- a/src/backend/opencl/OclThread.h +++ b/src/backend/opencl/OclThread.h @@ -26,7 +26,7 @@ #define XMRIG_OCLTHREAD_H -#include "rapidjson/fwd.h" +#include "3rdparty/rapidjson/fwd.h" #include diff --git a/src/backend/opencl/OclThreads.cpp b/src/backend/opencl/OclThreads.cpp index 3e53a5f5d..5b6995132 100644 --- a/src/backend/opencl/OclThreads.cpp +++ b/src/backend/opencl/OclThreads.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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,8 +27,8 @@ #include "backend/opencl/OclThreads.h" +#include "3rdparty/rapidjson/document.h" #include "base/io/json/Json.h" -#include "rapidjson/document.h" xmrig::OclThreads::OclThreads(const rapidjson::Value &value) diff --git a/src/backend/opencl/OclThreads.h b/src/backend/opencl/OclThreads.h index ed3ad18db..8d9c101e3 100644 --- a/src/backend/opencl/OclThreads.h +++ b/src/backend/opencl/OclThreads.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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 diff --git a/src/backend/opencl/wrappers/OclDevice.cpp b/src/backend/opencl/wrappers/OclDevice.cpp index cd90e95b7..68ab60722 100644 --- a/src/backend/opencl/wrappers/OclDevice.cpp +++ b/src/backend/opencl/wrappers/OclDevice.cpp @@ -24,11 +24,12 @@ #include "backend/opencl/wrappers/OclDevice.h" +#include "3rdparty/rapidjson/document.h" #include "backend/opencl/OclGenerator.h" #include "backend/opencl/OclThreads.h" #include "backend/opencl/wrappers/OclLib.h" #include "base/io/log/Log.h" -#include "rapidjson/document.h" + #ifdef XMRIG_FEATURE_ADL # include "backend/opencl/wrappers/AdlLib.h" diff --git a/src/backend/opencl/wrappers/OclPlatform.cpp b/src/backend/opencl/wrappers/OclPlatform.cpp index 601ee6fae..6c3509f08 100644 --- a/src/backend/opencl/wrappers/OclPlatform.cpp +++ b/src/backend/opencl/wrappers/OclPlatform.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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,9 +23,9 @@ */ -#include "backend/opencl/wrappers/OclLib.h" #include "backend/opencl/wrappers/OclPlatform.h" -#include "rapidjson/document.h" +#include "3rdparty/rapidjson/document.h" +#include "backend/opencl/wrappers/OclLib.h" std::vector xmrig::OclPlatform::get() diff --git a/src/backend/opencl/wrappers/OclPlatform.h b/src/backend/opencl/wrappers/OclPlatform.h index 133e84755..dc9bd24ee 100644 --- a/src/backend/opencl/wrappers/OclPlatform.h +++ b/src/backend/opencl/wrappers/OclPlatform.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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 diff --git a/src/base/api/interfaces/IApiRequest.h b/src/base/api/interfaces/IApiRequest.h index c23c16523..c05e513ec 100644 --- a/src/base/api/interfaces/IApiRequest.h +++ b/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 { diff --git a/src/base/api/requests/HttpApiRequest.cpp b/src/base/api/requests/HttpApiRequest.cpp index 6be25e968..70fa2523b 100644 --- a/src/base/api/requests/HttpApiRequest.cpp +++ b/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 { diff --git a/src/base/crypto/Algorithm.cpp b/src/base/crypto/Algorithm.cpp index 5ed372199..7d7db9b4f 100644 --- a/src/base/crypto/Algorithm.cpp +++ b/src/base/crypto/Algorithm.cpp @@ -25,7 +25,7 @@ #include "base/crypto/Algorithm.h" -#include "rapidjson/document.h" +#include "3rdparty/rapidjson/document.h" #include diff --git a/src/base/crypto/Algorithm.h b/src/base/crypto/Algorithm.h index 198ca4f21..1fb9e2acc 100644 --- a/src/base/crypto/Algorithm.h +++ b/src/base/crypto/Algorithm.h @@ -30,7 +30,7 @@ #include -#include "rapidjson/fwd.h" +#include "3rdparty/rapidjson/fwd.h" namespace xmrig { diff --git a/src/base/crypto/Coin.cpp b/src/base/crypto/Coin.cpp index 8b32e4fc2..57b5fcf0a 100644 --- a/src/base/crypto/Coin.cpp +++ b/src/base/crypto/Coin.cpp @@ -25,7 +25,7 @@ #include "base/crypto/Coin.h" -#include "rapidjson/document.h" +#include "3rdparty/rapidjson/document.h" #include diff --git a/src/base/crypto/Coin.h b/src/base/crypto/Coin.h index 3197c46dc..73eb8d24c 100644 --- a/src/base/crypto/Coin.h +++ b/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 { diff --git a/src/base/io/json/Json.cpp b/src/base/io/json/Json.cpp index cd7213d22..b9918d02f 100644 --- a/src/base/io/json/Json.cpp +++ b/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 diff --git a/src/base/io/json/Json.h b/src/base/io/json/Json.h index 15f340a76..c711d6ef2 100644 --- a/src/base/io/json/Json.h +++ b/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 { diff --git a/src/base/io/json/JsonChain.cpp b/src/base/io/json/JsonChain.cpp index bbaabbde9..972167f1b 100644 --- a/src/base/io/json/JsonChain.cpp +++ b/src/base/io/json/JsonChain.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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 { diff --git a/src/base/io/json/JsonChain.h b/src/base/io/json/JsonChain.h index 275f789ea..90f307422 100644 --- a/src/base/io/json/JsonChain.h +++ b/src/base/io/json/JsonChain.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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 +#include "3rdparty/rapidjson/document.h" #include "base/kernel/interfaces/IJsonReader.h" #include "base/tools/String.h" -#include "rapidjson/document.h" namespace xmrig { diff --git a/src/base/io/json/JsonRequest.cpp b/src/base/io/json/JsonRequest.cpp index d66040a7b..cacbdc809 100644 --- a/src/base/io/json/JsonRequest.cpp +++ b/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 { diff --git a/src/base/io/json/JsonRequest.h b/src/base/io/json/JsonRequest.h index b2e0b156e..88dbbad65 100644 --- a/src/base/io/json/JsonRequest.h +++ b/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 { diff --git a/src/base/io/json/Json_unix.cpp b/src/base/io/json/Json_unix.cpp index dedea947d..ebb45a3ba 100644 --- a/src/base/io/json/Json_unix.cpp +++ b/src/base/io/json/Json_unix.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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) diff --git a/src/base/io/json/Json_win.cpp b/src/base/io/json/Json_win.cpp index cb6f02f64..093cd3dab 100644 --- a/src/base/io/json/Json_win.cpp +++ b/src/base/io/json/Json_win.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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__) diff --git a/src/base/kernel/Base.h b/src/base/kernel/Base.h index 756b6cafc..f113c0f70 100644 --- a/src/base/kernel/Base.h +++ b/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 { diff --git a/src/base/kernel/config/BaseConfig.cpp b/src/base/kernel/config/BaseConfig.cpp index 12f5db742..1fe2d1edc 100644 --- a/src/base/kernel/config/BaseConfig.cpp +++ b/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" diff --git a/src/base/kernel/config/BaseTransform.h b/src/base/kernel/config/BaseTransform.h index 9550328ae..d6c08821b 100644 --- a/src/base/kernel/config/BaseTransform.h +++ b/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; diff --git a/src/base/kernel/interfaces/IClient.h b/src/base/kernel/interfaces/IClient.h index 9349aa6af..8a8776ba9 100644 --- a/src/base/kernel/interfaces/IClient.h +++ b/src/base/kernel/interfaces/IClient.h @@ -26,7 +26,7 @@ #define XMRIG_ICLIENT_H -#include "rapidjson/fwd.h" +#include "3rdparty/rapidjson/fwd.h" #include diff --git a/src/base/kernel/interfaces/IClientListener.h b/src/base/kernel/interfaces/IClientListener.h index 45b0bcfd2..4f2be302c 100644 --- a/src/base/kernel/interfaces/IClientListener.h +++ b/src/base/kernel/interfaces/IClientListener.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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 -#include "rapidjson/fwd.h" +#include "3rdparty/rapidjson/fwd.h" namespace xmrig { diff --git a/src/base/kernel/interfaces/IConfig.h b/src/base/kernel/interfaces/IConfig.h index 32f4b29b4..7e5c255d5 100644 --- a/src/base/kernel/interfaces/IConfig.h +++ b/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 { diff --git a/src/base/kernel/interfaces/IConfigTransform.h b/src/base/kernel/interfaces/IConfigTransform.h index 571d3e5a7..c8ada0b8b 100644 --- a/src/base/kernel/interfaces/IConfigTransform.h +++ b/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 { diff --git a/src/base/kernel/interfaces/IJsonReader.h b/src/base/kernel/interfaces/IJsonReader.h index c0fe09cb5..b545514db 100644 --- a/src/base/kernel/interfaces/IJsonReader.h +++ b/src/base/kernel/interfaces/IJsonReader.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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 { diff --git a/src/base/kernel/interfaces/IStrategyListener.h b/src/base/kernel/interfaces/IStrategyListener.h index 8b88b5068..4d99ce7f2 100644 --- a/src/base/kernel/interfaces/IStrategyListener.h +++ b/src/base/kernel/interfaces/IStrategyListener.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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 { diff --git a/src/base/net/http/HttpApiResponse.cpp b/src/base/net/http/HttpApiResponse.cpp index 6bf23c45b..fed3df53a 100644 --- a/src/base/net/http/HttpApiResponse.cpp +++ b/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 { diff --git a/src/base/net/http/HttpApiResponse.h b/src/base/net/http/HttpApiResponse.h index a50707354..8a7825108 100644 --- a/src/base/net/http/HttpApiResponse.h +++ b/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 { diff --git a/src/base/net/stratum/Client.cpp b/src/base/net/stratum/Client.cpp index 95de98c7d..815740162 100644 --- a/src/base/net/stratum/Client.cpp +++ b/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 diff --git a/src/base/net/stratum/DaemonClient.cpp b/src/base/net/stratum/DaemonClient.cpp index 89a8e67eb..59e2a6ff8 100644 --- a/src/base/net/stratum/DaemonClient.cpp +++ b/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 diff --git a/src/base/net/stratum/NetworkState.cpp b/src/base/net/stratum/NetworkState.cpp index 29d911e1f..16f76336d 100644 --- a/src/base/net/stratum/NetworkState.cpp +++ b/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 diff --git a/src/base/net/stratum/Pool.cpp b/src/base/net/stratum/Pool.cpp index e112feca3..afd7433f9 100644 --- a/src/base/net/stratum/Pool.cpp +++ b/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 diff --git a/src/base/net/stratum/Pool.h b/src/base/net/stratum/Pool.h index 02855200c..95703eca8 100644 --- a/src/base/net/stratum/Pool.h +++ b/src/base/net/stratum/Pool.h @@ -31,9 +31,9 @@ #include +#include "3rdparty/rapidjson/fwd.h" #include "base/crypto/Coin.h" #include "base/net/stratum/ProxyUrl.h" -#include "rapidjson/fwd.h" namespace xmrig { diff --git a/src/base/net/stratum/Pools.cpp b/src/base/net/stratum/Pools.cpp index a65e26b1d..90655547a 100644 --- a/src/base/net/stratum/Pools.cpp +++ b/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 { diff --git a/src/base/net/stratum/ProxyUrl.cpp b/src/base/net/stratum/ProxyUrl.cpp index 5b0ff281b..ad4542bc6 100644 --- a/src/base/net/stratum/ProxyUrl.cpp +++ b/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 { diff --git a/src/base/net/stratum/SelfSelectClient.cpp b/src/base/net/stratum/SelfSelectClient.cpp index 6fdcf14d6..8ad48b65c 100644 --- a/src/base/net/stratum/SelfSelectClient.cpp +++ b/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 { diff --git a/src/core/Miner.cpp b/src/core/Miner.cpp index 254428fbe..78beeb8ed 100644 --- a/src/core/Miner.cpp +++ b/src/core/Miner.cpp @@ -28,6 +28,8 @@ #include +#include "core/Miner.h" +#include "3rdparty/rapidjson/document.h" #include "backend/common/Hashrate.h" #include "backend/cpu/Cpu.h" #include "backend/cpu/CpuBackend.h" @@ -38,11 +40,9 @@ #include "base/tools/Timer.h" #include "core/config/Config.h" #include "core/Controller.h" -#include "core/Miner.h" +#include "crypto/astrobwt/AstroBWT.h" #include "crypto/common/Nonce.h" #include "crypto/rx/Rx.h" -#include "crypto/astrobwt/AstroBWT.h" -#include "rapidjson/document.h" #include "version.h" diff --git a/src/core/config/Config.cpp b/src/core/config/Config.cpp index fe3c8c33a..9fc6a830c 100644 --- a/src/core/config/Config.cpp +++ b/src/core/config/Config.cpp @@ -28,14 +28,12 @@ #include +#include "core/config/Config.h" +#include "3rdparty/rapidjson/document.h" #include "backend/cpu/Cpu.h" #include "base/io/log/Log.h" #include "base/kernel/interfaces/IJsonReader.h" -#include "core/config/Config.h" #include "crypto/common/Assembly.h" -#include "rapidjson/document.h" -#include "rapidjson/filewritestream.h" -#include "rapidjson/prettywriter.h" #ifdef XMRIG_ALGO_RANDOMX diff --git a/src/core/config/Config.h b/src/core/config/Config.h index 997fa505c..501b8c592 100644 --- a/src/core/config/Config.h +++ b/src/core/config/Config.h @@ -29,10 +29,10 @@ #include +#include "3rdparty/rapidjson/fwd.h" #include "backend/cpu/CpuConfig.h" #include "base/kernel/config/BaseConfig.h" #include "base/tools/Object.h" -#include "rapidjson/fwd.h" namespace xmrig { diff --git a/src/crypto/common/Assembly.cpp b/src/crypto/common/Assembly.cpp index 44bf0a949..5b7f8959b 100644 --- a/src/crypto/common/Assembly.cpp +++ b/src/crypto/common/Assembly.cpp @@ -6,8 +6,8 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018 SChernykh - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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 @@ -34,7 +34,7 @@ #include "crypto/common/Assembly.h" -#include "rapidjson/document.h" +#include "3rdparty/rapidjson/document.h" namespace xmrig { diff --git a/src/crypto/common/Assembly.h b/src/crypto/common/Assembly.h index 5ea29e11e..803ea7168 100644 --- a/src/crypto/common/Assembly.h +++ b/src/crypto/common/Assembly.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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_ASSEMBLY_H -#include "rapidjson/fwd.h" +#include "3rdparty/rapidjson/fwd.h" namespace xmrig { diff --git a/src/crypto/rx/RxConfig.cpp b/src/crypto/rx/RxConfig.cpp index 01d0616e9..82336708b 100644 --- a/src/crypto/rx/RxConfig.cpp +++ b/src/crypto/rx/RxConfig.cpp @@ -24,9 +24,9 @@ #include "crypto/rx/RxConfig.h" +#include "3rdparty/rapidjson/document.h" #include "backend/cpu/Cpu.h" #include "base/io/json/Json.h" -#include "rapidjson/document.h" #ifdef XMRIG_FEATURE_HWLOC diff --git a/src/crypto/rx/RxConfig.h b/src/crypto/rx/RxConfig.h index e42b3a711..af2ac9df8 100644 --- a/src/crypto/rx/RxConfig.h +++ b/src/crypto/rx/RxConfig.h @@ -26,7 +26,7 @@ #define XMRIG_RXCONFIG_H -#include "rapidjson/fwd.h" +#include "3rdparty/rapidjson/fwd.h" #ifdef XMRIG_FEATURE_MSR diff --git a/src/crypto/rx/msr/MsrItem.cpp b/src/crypto/rx/msr/MsrItem.cpp index 23cf5dc03..4c8e7f2af 100644 --- a/src/crypto/rx/msr/MsrItem.cpp +++ b/src/crypto/rx/msr/MsrItem.cpp @@ -7,8 +7,8 @@ * Copyright 2017-2019 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2019 tevador - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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 @@ #include "crypto/rx/msr/MsrItem.h" -#include "rapidjson/document.h" +#include "3rdparty/rapidjson/document.h" #include diff --git a/src/crypto/rx/msr/MsrItem.h b/src/crypto/rx/msr/MsrItem.h index 5b84f432d..b14fda3b6 100644 --- a/src/crypto/rx/msr/MsrItem.h +++ b/src/crypto/rx/msr/MsrItem.h @@ -7,8 +7,8 @@ * Copyright 2017-2019 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2019 tevador - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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 diff --git a/src/donate.h b/src/donate.h index 46f26b73e..a316389e7 100644 --- a/src/donate.h +++ b/src/donate.h @@ -5,7 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * 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 @@ -21,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef __DONATE_H__ -#define __DONATE_H__ +#ifndef XMRIG_DONATE_H +#define XMRIG_DONATE_H /* @@ -47,4 +48,4 @@ constexpr const int kDefaultDonateLevel = 5; constexpr const int kMinimumDonateLevel = 1; -#endif /* __DONATE_H__ */ +#endif /* XMRIG_DONATE_H */ diff --git a/src/net/Network.cpp b/src/net/Network.cpp index b2b32e016..976ea8c44 100644 --- a/src/net/Network.cpp +++ b/src/net/Network.cpp @@ -28,6 +28,7 @@ #endif #include "net/Network.h" +#include "3rdparty/rapidjson/document.h" #include "backend/common/Tags.h" #include "base/io/log/Log.h" #include "base/net/stratum/Client.h" @@ -41,7 +42,6 @@ #include "net/JobResult.h" #include "net/JobResults.h" #include "net/strategies/DonateStrategy.h" -#include "rapidjson/document.h" #ifdef XMRIG_FEATURE_API diff --git a/src/net/Network.h b/src/net/Network.h index 826c64d0d..17490fca2 100644 --- a/src/net/Network.h +++ b/src/net/Network.h @@ -27,13 +27,13 @@ #define XMRIG_NETWORK_H +#include "3rdparty/rapidjson/fwd.h" #include "base/api/interfaces/IApiListener.h" #include "base/kernel/interfaces/IBaseListener.h" #include "base/kernel/interfaces/IStrategyListener.h" #include "base/kernel/interfaces/ITimerListener.h" #include "base/tools/Object.h" #include "interfaces/IJobResultListener.h" -#include "rapidjson/fwd.h" #include diff --git a/src/net/strategies/DonateStrategy.cpp b/src/net/strategies/DonateStrategy.cpp index ace9cfa3f..b1a9b6cae 100644 --- a/src/net/strategies/DonateStrategy.cpp +++ b/src/net/strategies/DonateStrategy.cpp @@ -29,6 +29,7 @@ #include "net/strategies/DonateStrategy.h" +#include "3rdparty/rapidjson/document.h" #include "base/crypto/keccak.h" #include "base/kernel/Platform.h" #include "base/net/stratum/Client.h" @@ -41,7 +42,6 @@ #include "core/Controller.h" #include "core/Miner.h" #include "net/Network.h" -#include "rapidjson/document.h" namespace xmrig {