Resolved conflict between argon2 implementations.

This commit is contained in:
XMRig 2019-08-16 03:18:35 +07:00
parent 0c25424a3e
commit 043989e8ee
45 changed files with 160 additions and 163 deletions

View file

@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#pragma once
#include <cstdint>
#include "instruction.hpp"
#include "common.hpp"
#include "crypto/randomx/instruction.hpp"
#include "crypto/randomx/common.hpp"
namespace randomx {
@ -70,4 +70,4 @@ namespace randomx {
int asicLatencies[8];
};
}
}