Merge branch 'master' into mo

This commit is contained in:
MoneroOcean 2018-08-14 11:00:20 +02:00
commit f5dc226717
8 changed files with 55 additions and 55 deletions

View file

@ -44,7 +44,7 @@ public:
m_variant(VARIANT_AUTO)
{}
inline Algorithm(Algo algo, Variant variant) :
inline Algorithm(Algo algo, Variant variant = VARIANT_AUTO) :
m_variant(variant)
{
setAlgo(algo);

View file

@ -34,7 +34,8 @@ enum Algo {
INVALID_ALGO = -1,
CRYPTONIGHT, /* CryptoNight (Monero) */
CRYPTONIGHT_LITE, /* CryptoNight-Lite (AEON) */
CRYPTONIGHT_HEAVY /* CryptoNight-Heavy (SUMO) */
CRYPTONIGHT_HEAVY, /* CryptoNight-Heavy (SUMO) */
ALGO_MAX
};
// algorithms that can has different performance