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/bytecode_machine.hpp
+++ b/src/crypto/randomx/bytecode_machine.hpp
@@ -28,10 +28,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #pragma once

-#include "common.hpp"
-#include "intrin_portable.h"
-#include "instruction.hpp"
-#include "program.hpp"
+#include "crypto/randomx/common.hpp"
+#include "crypto/randomx/intrin_portable.h"
+#include "crypto/randomx/instruction.hpp"
+#include "crypto/randomx/program.hpp"

 namespace randomx {