diff --git a/src/base/tools/String.h b/src/base/tools/String.h index b2da0940..0c191dfd 100644 --- a/src/base/tools/String.h +++ b/src/base/tools/String.h @@ -60,7 +60,7 @@ public: bool isEqual(const String &other) const; - inline bool contains(const char *str) const { return strstr(m_data, str) != nullptr; } + inline bool contains(const char *str) const { return isNull() ? false : strstr(m_data, str) != nullptr; } inline bool isEmpty() const { return size() == 0; } @@ -75,6 +75,7 @@ public: inline bool operator<(const String &str) const { return strcmp(data(), str.data()) < 0; } inline bool operator==(const char *str) const { return isEqual(str); } inline bool operator==(const String &other) const { return isEqual(other); } + inline operator const char*() const { return m_data; } inline String &operator=(char *str) { move(str); return *this; } inline String &operator=(const char *str) { copy(str); return *this; } inline String &operator=(const String &str) { copy(str); return *this; } diff --git a/src/common/Platform_win.cpp b/src/common/Platform_win.cpp index 3fa7ea9a..9e9b772d 100644 --- a/src/common/Platform_win.cpp +++ b/src/common/Platform_win.cpp @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018 SChernykh - * Copyright 2016-2018 XMRig , + * Copyright 2016-2019 XMRig , * * 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 @@ -39,7 +39,9 @@ #endif +#ifdef XMRIG_AMD_PROJECT static uint32_t timerResolution = 0; +#endif static inline OSVERSIONINFOEX winOsVersion() diff --git a/src/common/config/ConfigLoader.cpp b/src/common/config/ConfigLoader.cpp index 0365e151..b3b3ecb0 100644 --- a/src/common/config/ConfigLoader.cpp +++ b/src/common/config/ConfigLoader.cpp @@ -5,7 +5,7 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2016-2019 XMRig , * * 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 diff --git a/src/common/config/ConfigLoader.h b/src/common/config/ConfigLoader.h index 840080f9..b9e04537 100644 --- a/src/common/config/ConfigLoader.h +++ b/src/common/config/ConfigLoader.h @@ -5,7 +5,7 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2016-2019 XMRig , * * 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 diff --git a/src/common/net/Client.cpp b/src/common/net/Client.cpp index c0ab50b1..8458b1e2 100644 --- a/src/common/net/Client.cpp +++ b/src/common/net/Client.cpp @@ -5,7 +5,7 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2016-2019 XMRig , * * 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 @@ -212,9 +212,11 @@ const char *Client::tlsVersion() const int64_t Client::submit(const JobResult &result) { +# ifndef XMRIG_PROXY_PROJECT if (result.clientId != m_rpcId) { return -1; } +# endif using namespace rapidjson; diff --git a/src/common/net/Client.h b/src/common/net/Client.h index d6418338..a05710fc 100644 --- a/src/common/net/Client.h +++ b/src/common/net/Client.h @@ -5,7 +5,7 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2016-2019 XMRig , * * 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 diff --git a/src/common/net/Id.h b/src/common/net/Id.h index 4b13e793..999e7837 100644 --- a/src/common/net/Id.h +++ b/src/common/net/Id.h @@ -5,7 +5,7 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2016-2019 XMRig , * * 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 diff --git a/src/common/net/Job.cpp b/src/common/net/Job.cpp index 6d3ee993..acb3b3f4 100644 --- a/src/common/net/Job.cpp +++ b/src/common/net/Job.cpp @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018 SChernykh - * Copyright 2016-2018 XMRig , + * Copyright 2016-2019 XMRig , * * 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 diff --git a/src/common/net/Job.h b/src/common/net/Job.h index 51e3428e..394727df 100644 --- a/src/common/net/Job.h +++ b/src/common/net/Job.h @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018 SChernykh - * Copyright 2016-2018 XMRig , + * Copyright 2016-2019 XMRig , * * 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 diff --git a/src/version.h b/src/version.h index 4f929666..05748d19 100644 --- a/src/version.h +++ b/src/version.h @@ -5,7 +5,7 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2016-2019 XMRig , * * 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 @@ -30,7 +30,7 @@ #define APP_VERSION "2.8.5-dev" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" -#define APP_COPYRIGHT "Copyright (C) 2016-2018 xmrig.com" +#define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com" #define APP_KIND "cpu" #define APP_VER_MAJOR 2