Ecosystem/xmrig
Ecosystem/xmrig
1
0
Fork 0
mirror of https://github.com/xmrig/xmrig.git synced 2025-01-18 16:55:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add 3rdparty prefix to all rapidjson includes.

Browse source
This commit is contained in:
XMRig 2020-04-29 14:55:04 +07:00
parent 46e49cde0b
commit 8aeba61706
No known key found for this signature in database
GPG key ID: 446A53638BE94409
76 changed files with 140 additions and 217 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/backend/common/Hashrate.cpp
View file

@ -5,8 +5,8 @@
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet> * Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com> * Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -30,10 +30,10 @@
#include "backend/common/Hashrate.h" #include "backend/common/Hashrate.h"
#include "3rdparty/rapidjson/document.h"
#include "base/io/json/Json.h" #include "base/io/json/Json.h"
#include "base/tools/Chrono.h" #include "base/tools/Chrono.h"
#include "base/tools/Handle.h" #include "base/tools/Handle.h"
#include "rapidjson/document.h"
inline static const char *format(double h, char *buf, size_t size) inline static const char *format(double h, char *buf, size_t size)

6
src/backend/common/Hashrate.h
View file

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

2
src/backend/common/Threads.cpp
View file

@ -24,9 +24,9 @@
#include "backend/common/Threads.h" #include "backend/common/Threads.h"
#include "3rdparty/rapidjson/document.h"
#include "backend/cpu/CpuThreads.h" #include "backend/cpu/CpuThreads.h"
#include "crypto/cn/CnAlgo.h" #include "crypto/cn/CnAlgo.h"
#include "rapidjson/document.h"
#ifdef XMRIG_FEATURE_OPENCL #ifdef XMRIG_FEATURE_OPENCL

2
src/backend/common/Threads.h
View file

@ -30,9 +30,9 @@
#include <set> #include <set>
#include "3rdparty/rapidjson/fwd.h"
#include "base/crypto/Algorithm.h" #include "base/crypto/Algorithm.h"
#include "base/tools/String.h" #include "base/tools/String.h"
#include "rapidjson/fwd.h"
namespace xmrig { namespace xmrig {

1
src/backend/common/common.cmake
View file

@ -4,7 +4,6 @@ set(HEADERS_BACKEND_COMMON
src/backend/common/interfaces/IBackend.h src/backend/common/interfaces/IBackend.h
src/backend/common/interfaces/IRxListener.h src/backend/common/interfaces/IRxListener.h
src/backend/common/interfaces/IRxStorage.h src/backend/common/interfaces/IRxStorage.h
src/backend/common/interfaces/IThread.h
src/backend/common/interfaces/IWorker.h src/backend/common/interfaces/IWorker.h
src/backend/common/misc/PciTopology.h src/backend/common/misc/PciTopology.h
src/backend/common/Thread.h src/backend/common/Thread.h

2
src/backend/common/interfaces/IBackend.h
View file

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

77
src/backend/common/interfaces/IThread.h
View file

@ -1,77 +0,0 @@
/* XMRig
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2016-2018 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
* 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 <http://www.gnu.org/licenses/>.
*/
#ifndef XMRIG_ITHREAD_H
#define XMRIG_ITHREAD_H
#include <stdint.h>
#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

2
src/backend/cpu/Cpu.cpp
View file

@ -27,7 +27,7 @@
#include "backend/cpu/Cpu.h" #include "backend/cpu/Cpu.h"
#include "rapidjson/document.h" #include "3rdparty/rapidjson/document.h"
#if defined(XMRIG_FEATURE_HWLOC) #if defined(XMRIG_FEATURE_HWLOC)

4
src/backend/cpu/CpuBackend.cpp
View file

@ -26,12 +26,13 @@
#include <mutex> #include <mutex>
#include "backend/cpu/CpuBackend.h"
#include "3rdparty/rapidjson/document.h"
#include "backend/common/Hashrate.h" #include "backend/common/Hashrate.h"
#include "backend/common/interfaces/IWorker.h" #include "backend/common/interfaces/IWorker.h"
#include "backend/common/Tags.h" #include "backend/common/Tags.h"
#include "backend/common/Workers.h" #include "backend/common/Workers.h"
#include "backend/cpu/Cpu.h" #include "backend/cpu/Cpu.h"
#include "backend/cpu/CpuBackend.h"
#include "base/io/log/Log.h" #include "base/io/log/Log.h"
#include "base/net/stratum/Job.h" #include "base/net/stratum/Job.h"
#include "base/tools/Chrono.h" #include "base/tools/Chrono.h"
@ -41,7 +42,6 @@
#include "crypto/common/VirtualMemory.h" #include "crypto/common/VirtualMemory.h"
#include "crypto/rx/Rx.h" #include "crypto/rx/Rx.h"
#include "crypto/rx/RxDataset.h" #include "crypto/rx/RxDataset.h"
#include "rapidjson/document.h"
#ifdef XMRIG_FEATURE_API #ifdef XMRIG_FEATURE_API

2
src/backend/cpu/CpuConfig.cpp
View file

@ -24,10 +24,10 @@
#include "backend/cpu/CpuConfig.h" #include "backend/cpu/CpuConfig.h"
#include "3rdparty/rapidjson/document.h"
#include "backend/cpu/CpuConfig_gen.h" #include "backend/cpu/CpuConfig_gen.h"
#include "backend/cpu/Cpu.h" #include "backend/cpu/Cpu.h"
#include "base/io/json/Json.h" #include "base/io/json/Json.h"
#include "rapidjson/document.h"
#include <algorithm> #include <algorithm>

6
src/backend/cpu/CpuThread.cpp
View file

@ -5,8 +5,8 @@
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet> * Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com> * Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -24,8 +24,8 @@
#include "backend/cpu/CpuThread.h" #include "backend/cpu/CpuThread.h"
#include "3rdparty/rapidjson/document.h"
#include "base/io/json/Json.h" #include "base/io/json/Json.h"
#include "rapidjson/document.h"
xmrig::CpuThread::CpuThread(const rapidjson::Value &value) xmrig::CpuThread::CpuThread(const rapidjson::Value &value)

6
src/backend/cpu/CpuThread.h
View file

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

6
src/backend/cpu/CpuThreads.cpp
View file

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

4
src/backend/cpu/CpuThreads.h
View file

@ -5,8 +5,8 @@
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet> * Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com> * Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by

2
src/backend/cuda/CudaBackend.cpp
View file

@ -28,6 +28,7 @@
#include "backend/cuda/CudaBackend.h" #include "backend/cuda/CudaBackend.h"
#include "3rdparty/rapidjson/document.h"
#include "backend/common/Hashrate.h" #include "backend/common/Hashrate.h"
#include "backend/common/interfaces/IWorker.h" #include "backend/common/interfaces/IWorker.h"
#include "backend/common/Tags.h" #include "backend/common/Tags.h"
@ -43,7 +44,6 @@
#include "base/tools/String.h" #include "base/tools/String.h"
#include "core/config/Config.h" #include "core/config/Config.h"
#include "core/Controller.h" #include "core/Controller.h"
#include "rapidjson/document.h"
#ifdef XMRIG_ALGO_ASTROBWT #ifdef XMRIG_ALGO_ASTROBWT

2
src/backend/cuda/CudaConfig.cpp
View file

@ -24,12 +24,12 @@
#include "backend/cuda/CudaConfig.h" #include "backend/cuda/CudaConfig.h"
#include "3rdparty/rapidjson/document.h"
#include "backend/common/Tags.h" #include "backend/common/Tags.h"
#include "backend/cuda/CudaConfig_gen.h" #include "backend/cuda/CudaConfig_gen.h"
#include "backend/cuda/wrappers/CudaLib.h" #include "backend/cuda/wrappers/CudaLib.h"
#include "base/io/json/Json.h" #include "base/io/json/Json.h"
#include "base/io/log/Log.h" #include "base/io/log/Log.h"
#include "rapidjson/document.h"
namespace xmrig { namespace xmrig {

2
src/backend/cuda/CudaThread.cpp
View file

@ -24,9 +24,9 @@
#include "backend/cuda/CudaThread.h" #include "backend/cuda/CudaThread.h"
#include "3rdparty/rapidjson/document.h"
#include "backend/cuda/wrappers/CudaLib.h" #include "backend/cuda/wrappers/CudaLib.h"
#include "base/io/json/Json.h" #include "base/io/json/Json.h"
#include "rapidjson/document.h"
#include <algorithm> #include <algorithm>

2
src/backend/cuda/CudaThread.h
View file

@ -29,7 +29,7 @@
using nvid_ctx = struct nvid_ctx; using nvid_ctx = struct nvid_ctx;
#include "rapidjson/fwd.h" #include "3rdparty/rapidjson/fwd.h"
namespace xmrig { namespace xmrig {

6
src/backend/cuda/CudaThreads.cpp
View file

@ -5,8 +5,8 @@
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet> * Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com> * Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -24,8 +24,8 @@
#include "backend/cuda/CudaThreads.h" #include "backend/cuda/CudaThreads.h"
#include "3rdparty/rapidjson/document.h"
#include "base/io/json/Json.h" #include "base/io/json/Json.h"
#include "rapidjson/document.h"
#include <algorithm> #include <algorithm>

4
src/backend/cuda/CudaThreads.h
View file

@ -5,8 +5,8 @@
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet> * Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com> * Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by

3
src/backend/cuda/wrappers/CudaDevice.cpp
View file

@ -24,11 +24,12 @@
#include "backend/cuda/wrappers/CudaDevice.h" #include "backend/cuda/wrappers/CudaDevice.h"
#include "3rdparty/rapidjson/document.h"
#include "backend/cuda/CudaThreads.h" #include "backend/cuda/CudaThreads.h"
#include "backend/cuda/wrappers/CudaLib.h" #include "backend/cuda/wrappers/CudaLib.h"
#include "base/crypto/Algorithm.h" #include "base/crypto/Algorithm.h"
#include "base/io/log/Log.h" #include "base/io/log/Log.h"
#include "rapidjson/document.h"
#ifdef XMRIG_FEATURE_NVML #ifdef XMRIG_FEATURE_NVML
# include "backend/cuda/wrappers/NvmlLib.h" # include "backend/cuda/wrappers/NvmlLib.h"

2
src/backend/opencl/OclBackend.cpp
View file

@ -28,6 +28,7 @@
#include "backend/opencl/OclBackend.h" #include "backend/opencl/OclBackend.h"
#include "3rdparty/rapidjson/document.h"
#include "backend/common/Hashrate.h" #include "backend/common/Hashrate.h"
#include "backend/common/interfaces/IWorker.h" #include "backend/common/interfaces/IWorker.h"
#include "backend/common/Tags.h" #include "backend/common/Tags.h"
@ -45,7 +46,6 @@
#include "base/tools/String.h" #include "base/tools/String.h"
#include "core/config/Config.h" #include "core/config/Config.h"
#include "core/Controller.h" #include "core/Controller.h"
#include "rapidjson/document.h"
#ifdef XMRIG_FEATURE_API #ifdef XMRIG_FEATURE_API

2
src/backend/opencl/OclConfig.cpp
View file

@ -24,12 +24,12 @@
#include "backend/opencl/OclConfig.h" #include "backend/opencl/OclConfig.h"
#include "3rdparty/rapidjson/document.h"
#include "backend/common/Tags.h" #include "backend/common/Tags.h"
#include "backend/opencl/OclConfig_gen.h" #include "backend/opencl/OclConfig_gen.h"
#include "backend/opencl/wrappers/OclLib.h" #include "backend/opencl/wrappers/OclLib.h"
#include "base/io/json/Json.h" #include "base/io/json/Json.h"
#include "base/io/log/Log.h" #include "base/io/log/Log.h"
#include "rapidjson/document.h"
namespace xmrig { namespace xmrig {

2
src/backend/opencl/OclThread.cpp
View file

@ -24,8 +24,8 @@
#include "backend/opencl/OclThread.h" #include "backend/opencl/OclThread.h"
#include "3rdparty/rapidjson/document.h"
#include "base/io/json/Json.h" #include "base/io/json/Json.h"
#include "rapidjson/document.h"
#include <algorithm> #include <algorithm>

2
src/backend/opencl/OclThread.h
View file

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

6
src/backend/opencl/OclThreads.cpp
View file

@ -5,8 +5,8 @@
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet> * Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com> * Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -27,8 +27,8 @@
#include "backend/opencl/OclThreads.h" #include "backend/opencl/OclThreads.h"
#include "3rdparty/rapidjson/document.h"
#include "base/io/json/Json.h" #include "base/io/json/Json.h"
#include "rapidjson/document.h"
xmrig::OclThreads::OclThreads(const rapidjson::Value &value) xmrig::OclThreads::OclThreads(const rapidjson::Value &value)

4
src/backend/opencl/OclThreads.h
View file

@ -5,8 +5,8 @@
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet> * Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com> * Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by

3
src/backend/opencl/wrappers/OclDevice.cpp
View file

@ -24,11 +24,12 @@
#include "backend/opencl/wrappers/OclDevice.h" #include "backend/opencl/wrappers/OclDevice.h"
#include "3rdparty/rapidjson/document.h"
#include "backend/opencl/OclGenerator.h" #include "backend/opencl/OclGenerator.h"
#include "backend/opencl/OclThreads.h" #include "backend/opencl/OclThreads.h"
#include "backend/opencl/wrappers/OclLib.h" #include "backend/opencl/wrappers/OclLib.h"
#include "base/io/log/Log.h" #include "base/io/log/Log.h"
#include "rapidjson/document.h"
#ifdef XMRIG_FEATURE_ADL #ifdef XMRIG_FEATURE_ADL
# include "backend/opencl/wrappers/AdlLib.h" # include "backend/opencl/wrappers/AdlLib.h"

8
src/backend/opencl/wrappers/OclPlatform.cpp
View file

@ -5,8 +5,8 @@
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet> * Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com> * Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * 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 "backend/opencl/wrappers/OclPlatform.h"
#include "rapidjson/document.h" #include "3rdparty/rapidjson/document.h"
#include "backend/opencl/wrappers/OclLib.h"
std::vector<xmrig::OclPlatform> xmrig::OclPlatform::get() std::vector<xmrig::OclPlatform> xmrig::OclPlatform::get()

4
src/backend/opencl/wrappers/OclPlatform.h
View file

@ -5,8 +5,8 @@
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet> * Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com> * Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by

2
src/base/api/interfaces/IApiRequest.h
View file

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

4
src/base/api/requests/HttpApiRequest.cpp
View file

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

2
src/base/crypto/Algorithm.cpp
View file

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

2
src/base/crypto/Algorithm.h
View file

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

2
src/base/crypto/Coin.cpp
View file

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

2
src/base/crypto/Coin.h
View file

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

2
src/base/io/json/Json.cpp
View file

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

2
src/base/io/json/Json.h
View file

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

8
src/base/io/json/JsonChain.cpp
View file

@ -5,8 +5,8 @@
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet> * Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com> * Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * 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 "base/io/json/JsonChain.h"
#include "3rdparty/rapidjson/error/en.h"
#include "base/io/json/Json.h"
#include "base/io/log/Log.h" #include "base/io/log/Log.h"
#include "rapidjson/error/en.h"
namespace xmrig { namespace xmrig {

6
src/base/io/json/JsonChain.h
View file

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

2
src/base/io/json/JsonRequest.cpp
View file

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

2
src/base/io/json/JsonRequest.h
View file

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

12
src/base/io/json/Json_unix.cpp
View file

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

12
src/base/io/json/Json_win.cpp
View file

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

2
src/base/kernel/Base.h
View file

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

2
src/base/kernel/config/BaseConfig.cpp
View file

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

2
src/base/kernel/config/BaseTransform.h
View file

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

2
src/base/kernel/interfaces/IClient.h
View file

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

6
src/base/kernel/interfaces/IClientListener.h
View file

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

2
src/base/kernel/interfaces/IConfig.h
View file

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

2
src/base/kernel/interfaces/IConfigTransform.h
View file

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

6
src/base/kernel/interfaces/IJsonReader.h
View file

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

6
src/base/kernel/interfaces/IStrategyListener.h
View file

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

4
src/base/net/http/HttpApiResponse.cpp
View file

@ -26,9 +26,9 @@
#include "base/net/http/HttpApiResponse.h" #include "base/net/http/HttpApiResponse.h"
#include "3rdparty/http-parser/http_parser.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 "base/net/http/HttpData.h"
#include "rapidjson/prettywriter.h"
#include "rapidjson/stringbuffer.h"
namespace xmrig { namespace xmrig {

2
src/base/net/http/HttpApiResponse.h
View file

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

8
src/base/net/stratum/Client.cpp
View file

@ -39,6 +39,10 @@
#include "base/net/stratum/Client.h" #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/Json.h"
#include "base/io/json/JsonRequest.h" #include "base/io/json/JsonRequest.h"
#include "base/io/log/Log.h" #include "base/io/log/Log.h"
@ -49,10 +53,6 @@
#include "base/tools/Buffer.h" #include "base/tools/Buffer.h"
#include "base/tools/Chrono.h" #include "base/tools/Chrono.h"
#include "net/JobResult.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 #ifdef _MSC_VER

4
src/base/net/stratum/DaemonClient.cpp
View file

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

2
src/base/net/stratum/NetworkState.cpp
View file

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

2
src/base/net/stratum/Pool.cpp
View file

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

2
src/base/net/stratum/Pool.h
View file

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

2
src/base/net/stratum/Pools.cpp
View file

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

2
src/base/net/stratum/ProxyUrl.cpp
View file

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

4
src/base/net/stratum/SelfSelectClient.cpp
View file

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

6
src/core/Miner.cpp
View file

@ -28,6 +28,8 @@
#include <thread> #include <thread>
#include "core/Miner.h"
#include "3rdparty/rapidjson/document.h"
#include "backend/common/Hashrate.h" #include "backend/common/Hashrate.h"
#include "backend/cpu/Cpu.h" #include "backend/cpu/Cpu.h"
#include "backend/cpu/CpuBackend.h" #include "backend/cpu/CpuBackend.h"
@ -38,11 +40,9 @@
#include "base/tools/Timer.h" #include "base/tools/Timer.h"
#include "core/config/Config.h" #include "core/config/Config.h"
#include "core/Controller.h" #include "core/Controller.h"
#include "core/Miner.h" #include "crypto/astrobwt/AstroBWT.h"
#include "crypto/common/Nonce.h" #include "crypto/common/Nonce.h"
#include "crypto/rx/Rx.h" #include "crypto/rx/Rx.h"
#include "crypto/astrobwt/AstroBWT.h"
#include "rapidjson/document.h"
#include "version.h" #include "version.h"

6
src/core/config/Config.cpp
View file

@ -28,14 +28,12 @@
#include <cinttypes> #include <cinttypes>
#include "core/config/Config.h"
#include "3rdparty/rapidjson/document.h"
#include "backend/cpu/Cpu.h" #include "backend/cpu/Cpu.h"
#include "base/io/log/Log.h" #include "base/io/log/Log.h"
#include "base/kernel/interfaces/IJsonReader.h" #include "base/kernel/interfaces/IJsonReader.h"
#include "core/config/Config.h"
#include "crypto/common/Assembly.h" #include "crypto/common/Assembly.h"
#include "rapidjson/document.h"
#include "rapidjson/filewritestream.h"
#include "rapidjson/prettywriter.h"
#ifdef XMRIG_ALGO_RANDOMX #ifdef XMRIG_ALGO_RANDOMX

2
src/core/config/Config.h
View file

@ -29,10 +29,10 @@
#include <cstdint> #include <cstdint>
#include "3rdparty/rapidjson/fwd.h"
#include "backend/cpu/CpuConfig.h" #include "backend/cpu/CpuConfig.h"
#include "base/kernel/config/BaseConfig.h" #include "base/kernel/config/BaseConfig.h"
#include "base/tools/Object.h" #include "base/tools/Object.h"
#include "rapidjson/fwd.h"
namespace xmrig { namespace xmrig {

6
src/crypto/common/Assembly.cpp
View file

@ -6,8 +6,8 @@
* Copyright 2016 Jay D Dee <jayddee246@gmail.com> * Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018 SChernykh <https://github.com/SChernykh> * Copyright 2018 SChernykh <https://github.com/SChernykh>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -34,7 +34,7 @@
#include "crypto/common/Assembly.h" #include "crypto/common/Assembly.h"
#include "rapidjson/document.h" #include "3rdparty/rapidjson/document.h"
namespace xmrig { namespace xmrig {

6
src/crypto/common/Assembly.h
View file

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

2
src/crypto/rx/RxConfig.cpp
View file

@ -24,9 +24,9 @@
#include "crypto/rx/RxConfig.h" #include "crypto/rx/RxConfig.h"
#include "3rdparty/rapidjson/document.h"
#include "backend/cpu/Cpu.h" #include "backend/cpu/Cpu.h"
#include "base/io/json/Json.h" #include "base/io/json/Json.h"
#include "rapidjson/document.h"
#ifdef XMRIG_FEATURE_HWLOC #ifdef XMRIG_FEATURE_HWLOC

2
src/crypto/rx/RxConfig.h
View file

@ -26,7 +26,7 @@
#define XMRIG_RXCONFIG_H #define XMRIG_RXCONFIG_H
#include "rapidjson/fwd.h" #include "3rdparty/rapidjson/fwd.h"
#ifdef XMRIG_FEATURE_MSR #ifdef XMRIG_FEATURE_MSR

6
src/crypto/rx/msr/MsrItem.cpp
View file

@ -7,8 +7,8 @@
* Copyright 2017-2019 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2019 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018 Lee Clagett <https://github.com/vtnerd> * Copyright 2018 Lee Clagett <https://github.com/vtnerd>
* Copyright 2018-2019 tevador <tevador@gmail.com> * Copyright 2018-2019 tevador <tevador@gmail.com>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -26,7 +26,7 @@
#include "crypto/rx/msr/MsrItem.h" #include "crypto/rx/msr/MsrItem.h"
#include "rapidjson/document.h" #include "3rdparty/rapidjson/document.h"
#include <cstdio> #include <cstdio>

4
src/crypto/rx/msr/MsrItem.h
View file

@ -7,8 +7,8 @@
* Copyright 2017-2019 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2019 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018 Lee Clagett <https://github.com/vtnerd> * Copyright 2018 Lee Clagett <https://github.com/vtnerd>
* Copyright 2018-2019 tevador <tevador@gmail.com> * Copyright 2018-2019 tevador <tevador@gmail.com>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by

9
src/donate.h
View file

@ -5,7 +5,8 @@
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet> * Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com> * Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2016-2018 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 * 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 * it under the terms of the GNU General Public License as published by
@ -21,8 +22,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __DONATE_H__ #ifndef XMRIG_DONATE_H
#define __DONATE_H__ #define XMRIG_DONATE_H
/* /*
@ -47,4 +48,4 @@ constexpr const int kDefaultDonateLevel = 5;
constexpr const int kMinimumDonateLevel = 1; constexpr const int kMinimumDonateLevel = 1;
#endif /* __DONATE_H__ */ #endif /* XMRIG_DONATE_H */

2
src/net/Network.cpp
View file

@ -28,6 +28,7 @@
#endif #endif
#include "net/Network.h" #include "net/Network.h"
#include "3rdparty/rapidjson/document.h"
#include "backend/common/Tags.h" #include "backend/common/Tags.h"
#include "base/io/log/Log.h" #include "base/io/log/Log.h"
#include "base/net/stratum/Client.h" #include "base/net/stratum/Client.h"
@ -41,7 +42,6 @@
#include "net/JobResult.h" #include "net/JobResult.h"
#include "net/JobResults.h" #include "net/JobResults.h"
#include "net/strategies/DonateStrategy.h" #include "net/strategies/DonateStrategy.h"
#include "rapidjson/document.h"
#ifdef XMRIG_FEATURE_API #ifdef XMRIG_FEATURE_API

2
src/net/Network.h
View file

@ -27,13 +27,13 @@
#define XMRIG_NETWORK_H #define XMRIG_NETWORK_H
#include "3rdparty/rapidjson/fwd.h"
#include "base/api/interfaces/IApiListener.h" #include "base/api/interfaces/IApiListener.h"
#include "base/kernel/interfaces/IBaseListener.h" #include "base/kernel/interfaces/IBaseListener.h"
#include "base/kernel/interfaces/IStrategyListener.h" #include "base/kernel/interfaces/IStrategyListener.h"
#include "base/kernel/interfaces/ITimerListener.h" #include "base/kernel/interfaces/ITimerListener.h"
#include "base/tools/Object.h" #include "base/tools/Object.h"
#include "interfaces/IJobResultListener.h" #include "interfaces/IJobResultListener.h"
#include "rapidjson/fwd.h"
#include <vector> #include <vector>

2
src/net/strategies/DonateStrategy.cpp
View file

@ -29,6 +29,7 @@
#include "net/strategies/DonateStrategy.h" #include "net/strategies/DonateStrategy.h"
#include "3rdparty/rapidjson/document.h"
#include "base/crypto/keccak.h" #include "base/crypto/keccak.h"
#include "base/kernel/Platform.h" #include "base/kernel/Platform.h"
#include "base/net/stratum/Client.h" #include "base/net/stratum/Client.h"
@ -41,7 +42,6 @@
#include "core/Controller.h" #include "core/Controller.h"
#include "core/Miner.h" #include "core/Miner.h"
#include "net/Network.h" #include "net/Network.h"
#include "rapidjson/document.h"
namespace xmrig { namespace xmrig {