1
0
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-07 16:05:05 -05:00

Compare commits

..

2 Commits

Author SHA1 Message Date
XMRig
a6a0f80b12 Fix header path. 2025-06-06 14:42:49 +07:00
XMRig
682834b87d Universal fix for NaN and Infinity in JSON output 2025-06-06 14:36:21 +07:00
2 changed files with 11 additions and 3 deletions

View File

@@ -29,6 +29,8 @@ else()
set(WITH_VAES OFF) set(WITH_VAES OFF)
endif() endif()
add_definitions(-DRAPIDJSON_WRITE_DEFAULT_FLAGS=6) # rapidjson::kWriteNanAndInfFlag | rapidjson::kWriteNanAndInfNullFlag
if (ARM_V8) if (ARM_V8)
set(ARM_TARGET 8) set(ARM_TARGET 8)
elseif (ARM_V7) elseif (ARM_V7)

View File

@@ -1,6 +1,6 @@
/* XMRig /* XMRig
* Copyright (c) 2018-2024 SChernykh <https://github.com/SChernykh> * Copyright (c) 2018-2025 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2024 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright (c) 2016-2025 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
@@ -20,6 +20,7 @@
#include "base/api/Api.h" #include "base/api/Api.h"
#include "3rdparty/rapidjson/writer.h"
#include "base/api/interfaces/IApiListener.h" #include "base/api/interfaces/IApiListener.h"
#include "base/api/requests/HttpApiRequest.h" #include "base/api/requests/HttpApiRequest.h"
#include "base/crypto/keccak.h" #include "base/crypto/keccak.h"
@@ -31,7 +32,6 @@
#include "base/tools/Chrono.h" #include "base/tools/Chrono.h"
#include "base/tools/Cvt.h" #include "base/tools/Cvt.h"
#include "core/config/Config.h" #include "core/config/Config.h"
#include "core/Controller.h"
#include "version.h" #include "version.h"
@@ -46,6 +46,12 @@
namespace xmrig { namespace xmrig {
static_assert(
RAPIDJSON_WRITE_DEFAULT_FLAGS == (rapidjson::kWriteNanAndInfFlag | rapidjson::kWriteNanAndInfNullFlag),
"(rapidjson::kWriteNanAndInfFlag | rapidjson::kWriteNanAndInfNullFlag) required"
);
static rapidjson::Value getResources(rapidjson::Document &doc) static rapidjson::Value getResources(rapidjson::Document &doc)
{ {
using namespace rapidjson; using namespace rapidjson;