Resolved conflict between argon2 implementations.

2019-08-16 03:18:35 +07:00
parent faf18262eb
commit 54994d361b
45 changed files with 160 additions and 163 deletions
--- a/src/crypto/randomx/superscalar_program.hpp
+++ b/src/crypto/randomx/superscalar_program.hpp
@@ -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];
 	};

-}
+}