Merge xmrig v6.3.5

This commit is contained in:
MoneroOcean 2020-10-03 19:45:28 +00:00
commit 61fed602be
19 changed files with 203 additions and 116 deletions

View file

@ -103,7 +103,7 @@ public:
inline bool isCN() const { auto f = family(); return f == CN || f == CN_LITE || f == CN_HEAVY || f == CN_PICO; }
inline bool isEqual(const Algorithm &other) const { return m_id == other.m_id; }
inline bool isValid() const { return m_id != INVALID; }
inline bool isValid() const { return m_id != INVALID && family() != UNKNOWN; }
inline const char *name() const { return name(false); }
inline const char *shortName() const { return name(true); }
inline Family family() const { return family(m_id); }

View file

@ -33,7 +33,7 @@
xmrig::String::String(const char *str) :
m_size(str == nullptr ? 0 : strlen(str))
{
if (m_size == 0) {
if (str == nullptr) {
return;
}