fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolved conflict between argon2 implementations.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
src/crypto/randomx/superscalar.hpp
View file

@ -30,8 +30,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <cstdint>
#include <vector>
#include "superscalar_program.hpp"
#include "blake2_generator.hpp"
#include "crypto/randomx/superscalar_program.hpp"
#include "crypto/randomx/blake2_generator.hpp"
namespace randomx {
// Intel Ivy Bridge reference
@ -57,4 +57,4 @@ namespace randomx {
void generateSuperscalar(SuperscalarProgram& prog, Blake2Generator& gen);
void executeSuperscalar(uint64_t(&r)[8], SuperscalarProgram& prog, std::vector<uint64_t> *reciprocals = nullptr);
}
}