CrimsonHawk/xmrig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sync changes with the proxy.

Browse source
This commit is contained in:
XMRig 2020-07-16 23:29:21 +07:00
parent ba80e27349
commit ca535c7813
No known key found for this signature in database
GPG key ID: 446A53638BE94409
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,9 +36,7 @@ static const rapidjson::Value kNullValue;
}
xmrig::JsonChain::JsonChain()
{
}
xmrig::JsonChain::JsonChain() = default;
bool xmrig::JsonChain::add(rapidjson::Document &&doc)
@ -66,8 +64,10 @@ bool xmrig::JsonChain::addFile(const char *fileName)
if (doc.HasParseError()) {
const size_t offset = doc.GetErrorOffset();
size_t line, pos;
size_t line;
size_t pos;
std::vector<std::string> s;
if (Json::convertOffset(fileName, offset, line, pos, s)) {
for (const auto& t : s) {
LOG_ERR("%s", t.c_str());

10
src/base/io/log/Tags.cpp
View file

@ -73,6 +73,16 @@ const char *xmrig::Tags::randomx()
#endif
#ifdef XMRIG_PROXY_PROJECT
const char *xmrig::Tags::proxy()
{
static const char *tag = MAGENTA_BG_BOLD(WHITE_BOLD_S " proxy ");
return tag;
}
#endif
#ifdef XMRIG_FEATURE_CUDA
const char *xmrig::Tags::nvidia()
{

4
src/base/io/log/Tags.h
View file

@ -42,6 +42,10 @@ public:
# endif
# endif
# ifdef XMRIG_PROXY_PROJECT
static const char *proxy();
# endif
# ifdef XMRIG_FEATURE_CUDA
static const char *nvidia();
# endif