Merge branch 'dev' into feature-opencl

This commit is contained in:
XMRig 2019-08-17 23:33:48 +07:00
commit bd07f1d455
121 changed files with 5477 additions and 369 deletions

View file

@ -66,7 +66,11 @@ size_t xmrig::Threads<T>::read(const rapidjson::Value &value)
if (!threads.isEmpty()) {
move(member.name.GetString(), std::move(threads));
}
}
}
for (auto &member : value.GetObject()) {
if (member.value.IsArray() || member.value.IsObject()) {
continue;
}