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/vm_interpreted.cpp
+++ b/src/crypto/randomx/vm_interpreted.cpp
@@ -26,10 +26,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "vm_interpreted.hpp"
-#include "dataset.hpp"
-#include "intrin_portable.h"
-#include "reciprocal.h"
+#include "crypto/randomx/vm_interpreted.hpp"
+#include "crypto/randomx/dataset.hpp"
+#include "crypto/randomx/intrin_portable.h"
+#include "crypto/randomx/reciprocal.h"

 namespace randomx {