mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-16 11:12:47 -05:00
Code Issues Projects Releases Wiki Activity

Merge xmrig v6.15.0 into master

Browse Source
This commit is contained in:
MoneroOcean
2021-08-31 16:45:39 +00:00
parent e76dcad6bc 5c1f3f395c
commit 29fa5c61e0
258 changed files with 13719 additions and 8163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/cpu/CpuBackend.cpp
View File

@@ -136,7 +136,7 @@ private:
class CpuBackendPrivate
{
public:
inline CpuBackendPrivate(Controller *controller) : controller(controller) {}
inline explicit CpuBackendPrivate(Controller *controller) : controller(controller) {}
inline void start()
@@ -159,7 +159,7 @@ public:
}
size_t ways()
size_t ways() const
{
std::lock_guard<std::mutex> lock(mutex);
@@ -167,7 +167,7 @@ public:
}
rapidjson::Value hugePages(int version, rapidjson::Document &doc)
rapidjson::Value hugePages(int version, rapidjson::Document &doc) const
{
HugePagesInfo pages;