mirror of
https://github.com/xmrig/xmrig.git
synced 2025-12-25 13:42:54 -05:00
Fixed merge
This commit is contained in:
@@ -67,7 +67,7 @@ size_t xmrig::OclRyoRunner::bufferSize() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void xmrig::OclRyoRunner::run(uint32_t nonce, uint32_t *hashOutput)
|
void xmrig::OclRyoRunner::run(uint32_t nonce, uint32_t /*nonce_offset*/, uint32_t *hashOutput)
|
||||||
{
|
{
|
||||||
static const cl_uint zero = 0;
|
static const cl_uint zero = 0;
|
||||||
|
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ public:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
size_t bufferSize() const override;
|
size_t bufferSize() const override;
|
||||||
void run(uint32_t nonce, uint32_t *hashOutput) override;
|
void run(uint32_t nonce, uint32_t nonce_offset, uint32_t *hashOutput) override;
|
||||||
void set(const Job &job, uint8_t *blob) override;
|
void set(const Job &job, uint8_t *blob) override;
|
||||||
void build() override;
|
void build() override;
|
||||||
void init() override;
|
void init() override;
|
||||||
|
|||||||
Reference in New Issue
Block a user