mirror of
https://github.com/GOSTSec/ccminer
synced 2025-01-31 08:54:38 +00:00
fix g++ 7.3 warnings (ubuntu 18.04)
This commit is contained in:
parent
d9f242b8d1
commit
654e8a10ec
2
api.cpp
2
api.cpp
@ -257,7 +257,7 @@ static char *getpoolnfo(char *params)
|
|||||||
|
|
||||||
static void gpuhwinfos(int gpu_id)
|
static void gpuhwinfos(int gpu_id)
|
||||||
{
|
{
|
||||||
char buf[256];
|
char buf[512];
|
||||||
char pstate[8];
|
char pstate[8];
|
||||||
char* card;
|
char* card;
|
||||||
struct cgpu_info *cgpu = NULL;
|
struct cgpu_info *cgpu = NULL;
|
||||||
|
14
scrypt.cpp
14
scrypt.cpp
@ -50,7 +50,17 @@ using namespace Concurrency;
|
|||||||
|
|
||||||
#if _MSC_VER > 1800
|
#if _MSC_VER > 1800
|
||||||
#undef _THROW1
|
#undef _THROW1
|
||||||
|
#if __cplusplus < 201101L
|
||||||
#define _THROW1(x) throw(std::bad_alloc)
|
#define _THROW1(x) throw(std::bad_alloc)
|
||||||
|
#else
|
||||||
|
#define _THROW1(x) noexcept(false)
|
||||||
|
#endif
|
||||||
|
#elif !defined(_MSC_VER)
|
||||||
|
#if __cplusplus < 201101L
|
||||||
|
#define _THROW1(x) throw(std::bad_alloc)
|
||||||
|
#else
|
||||||
|
#define _THROW1(x) noexcept(false)
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// A thin wrapper around the builtin __m128i type
|
// A thin wrapper around the builtin __m128i type
|
||||||
@ -63,9 +73,9 @@ public:
|
|||||||
void * operator new[](size_t size) _THROW1(_STD bad_alloc) { void *p; if ((p = _aligned_malloc(size, 16)) == 0) { static const std::bad_alloc nomem; _RAISE(nomem); } return (p); }
|
void * operator new[](size_t size) _THROW1(_STD bad_alloc) { void *p; if ((p = _aligned_malloc(size, 16)) == 0) { static const std::bad_alloc nomem; _RAISE(nomem); } return (p); }
|
||||||
void operator delete[](void *p) { _aligned_free(p); }
|
void operator delete[](void *p) { _aligned_free(p); }
|
||||||
#else
|
#else
|
||||||
void * operator new(size_t size) throw(std::bad_alloc) { void *p; if (posix_memalign(&p, 16, size) < 0) { static const std::bad_alloc nomem; throw nomem; } return (p); }
|
void * operator new(size_t size) _THROW1(_STD bad_alloc) { void *p; if (posix_memalign(&p, 16, size) < 0) { static const std::bad_alloc nomem; throw nomem; } return (p); }
|
||||||
void operator delete(void *p) { free(p); }
|
void operator delete(void *p) { free(p); }
|
||||||
void * operator new[](size_t size) throw(std::bad_alloc) { void *p; if (posix_memalign(&p, 16, size) < 0) { static const std::bad_alloc nomem; throw nomem; } return (p); }
|
void * operator new[](size_t size) _THROW1(_STD bad_alloc) { void *p; if (posix_memalign(&p, 16, size) < 0) { static const std::bad_alloc nomem; throw nomem; } return (p); }
|
||||||
void operator delete[](void *p) { free(p); }
|
void operator delete[](void *p) { free(p); }
|
||||||
#endif
|
#endif
|
||||||
uint32x4_t() { };
|
uint32x4_t() { };
|
||||||
|
@ -47,7 +47,7 @@ texture<uint4, 2, cudaReadModeElementType> texRef2D_4_V;
|
|||||||
|
|
||||||
template <int ALGO> __device__ __forceinline__ void block_mixer(uint4 &b, uint4 &bx, const int x1, const int x2, const int x3);
|
template <int ALGO> __device__ __forceinline__ void block_mixer(uint4 &b, uint4 &bx, const int x1, const int x2, const int x3);
|
||||||
|
|
||||||
static __host__ __device__ uint4& operator^=(uint4& left, const uint4& right) {
|
static __device__ uint4& operator^=(uint4& left, const uint4& right) {
|
||||||
left.x ^= right.x;
|
left.x ^= right.x;
|
||||||
left.y ^= right.y;
|
left.y ^= right.y;
|
||||||
left.z ^= right.z;
|
left.z ^= right.z;
|
||||||
@ -55,7 +55,7 @@ static __host__ __device__ uint4& operator^=(uint4& left, const uint4& right) {
|
|||||||
return left;
|
return left;
|
||||||
}
|
}
|
||||||
|
|
||||||
static __host__ __device__ uint4& operator+=(uint4& left, const uint4& right) {
|
static __device__ uint4& operator+=(uint4& left, const uint4& right) {
|
||||||
left.x += right.x;
|
left.x += right.x;
|
||||||
left.y += right.y;
|
left.y += right.y;
|
||||||
left.z += right.z;
|
left.z += right.z;
|
||||||
@ -63,7 +63,6 @@ static __host__ __device__ uint4& operator+=(uint4& left, const uint4& right) {
|
|||||||
return left;
|
return left;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* write_keys writes the 8 keys being processed by a warp to the global
|
/* write_keys writes the 8 keys being processed by a warp to the global
|
||||||
* scratchpad. To effectively use memory bandwidth, it performs the writes
|
* scratchpad. To effectively use memory bandwidth, it performs the writes
|
||||||
* (and reads, for read_keys) 128 bytes at a time per memory location
|
* (and reads, for read_keys) 128 bytes at a time per memory location
|
||||||
|
@ -50,7 +50,7 @@ __constant__ uint32_t c_SCRATCH_WU_PER_WARP_1; // (SCRATCH * WU_PER_WARP)-1
|
|||||||
|
|
||||||
template <int ALGO> __device__ __forceinline__ void block_mixer(uint4 &b, uint4 &bx, const int x1, const int x2, const int x3);
|
template <int ALGO> __device__ __forceinline__ void block_mixer(uint4 &b, uint4 &bx, const int x1, const int x2, const int x3);
|
||||||
|
|
||||||
static __host__ __device__ uint4& operator ^= (uint4& left, const uint4& right) {
|
static __device__ uint4& operator ^= (uint4& left, const uint4& right) {
|
||||||
left.x ^= right.x;
|
left.x ^= right.x;
|
||||||
left.y ^= right.y;
|
left.y ^= right.y;
|
||||||
left.z ^= right.z;
|
left.z ^= right.z;
|
||||||
@ -58,7 +58,7 @@ static __host__ __device__ uint4& operator ^= (uint4& left, const uint4& right)
|
|||||||
return left;
|
return left;
|
||||||
}
|
}
|
||||||
|
|
||||||
static __host__ __device__ uint4& operator += (uint4& left, const uint4& right) {
|
static __device__ uint4& operator += (uint4& left, const uint4& right) {
|
||||||
left.x += right.x;
|
left.x += right.x;
|
||||||
left.y += right.y;
|
left.y += right.y;
|
||||||
left.z += right.z;
|
left.z += right.z;
|
||||||
|
@ -74,10 +74,10 @@ char* sia_getheader(CURL *curl, struct pool_infos *pool)
|
|||||||
struct data_buffer all_data = { 0 };
|
struct data_buffer all_data = { 0 };
|
||||||
struct curl_slist *headers = NULL;
|
struct curl_slist *headers = NULL;
|
||||||
char data[256] = { 0 };
|
char data[256] = { 0 };
|
||||||
char url[512];
|
char url[512*3];
|
||||||
|
|
||||||
// nanopool
|
// nanopool
|
||||||
snprintf(url, 512, "%s/miner/header?address=%s&worker=%s", //&longpoll
|
snprintf(url, sizeof(url), "%s/miner/header?address=%s&worker=%s", //&longpoll
|
||||||
pool->url, pool->user, pool->pass);
|
pool->url, pool->user, pool->pass);
|
||||||
|
|
||||||
if (opt_protocol)
|
if (opt_protocol)
|
||||||
@ -148,7 +148,7 @@ bool sia_submit(CURL *curl, struct pool_infos *pool, struct work *work)
|
|||||||
struct data_buffer all_data = { 0 };
|
struct data_buffer all_data = { 0 };
|
||||||
struct curl_slist *headers = NULL;
|
struct curl_slist *headers = NULL;
|
||||||
char buf[256] = { 0 };
|
char buf[256] = { 0 };
|
||||||
char url[512];
|
char url[512*3];
|
||||||
|
|
||||||
if (opt_protocol)
|
if (opt_protocol)
|
||||||
applog_hex(work->data, 80);
|
applog_hex(work->data, 80);
|
||||||
@ -156,7 +156,7 @@ bool sia_submit(CURL *curl, struct pool_infos *pool, struct work *work)
|
|||||||
//applog_hex(&work->data[10], 4);
|
//applog_hex(&work->data[10], 4);
|
||||||
|
|
||||||
// nanopool
|
// nanopool
|
||||||
snprintf(url, 512, "%s/miner/header?address=%s&worker=%s",
|
snprintf(url, sizeof(url), "%s/miner/header?address=%s&worker=%s",
|
||||||
pool->url, pool->user, pool->pass);
|
pool->url, pool->user, pool->pass);
|
||||||
|
|
||||||
if (opt_protocol)
|
if (opt_protocol)
|
||||||
|
4
util.cpp
4
util.cpp
@ -616,7 +616,7 @@ err_out:
|
|||||||
json_t *json_rpc_call_pool(CURL *curl, struct pool_infos *pool, const char *req,
|
json_t *json_rpc_call_pool(CURL *curl, struct pool_infos *pool, const char *req,
|
||||||
bool longpoll_scan, bool longpoll, int *curl_err)
|
bool longpoll_scan, bool longpoll, int *curl_err)
|
||||||
{
|
{
|
||||||
char userpass[512];
|
char userpass[768];
|
||||||
// todo, malloc and store that in pool array
|
// todo, malloc and store that in pool array
|
||||||
snprintf(userpass, sizeof(userpass), "%s%c%s", pool->user,
|
snprintf(userpass, sizeof(userpass), "%s%c%s", pool->user,
|
||||||
strlen(pool->pass)?':':'\0', pool->pass);
|
strlen(pool->pass)?':':'\0', pool->pass);
|
||||||
@ -627,7 +627,7 @@ json_t *json_rpc_call_pool(CURL *curl, struct pool_infos *pool, const char *req,
|
|||||||
/* called only from longpoll thread, we have the lp_url */
|
/* called only from longpoll thread, we have the lp_url */
|
||||||
json_t *json_rpc_longpoll(CURL *curl, char *lp_url, struct pool_infos *pool, const char *req, int *curl_err)
|
json_t *json_rpc_longpoll(CURL *curl, char *lp_url, struct pool_infos *pool, const char *req, int *curl_err)
|
||||||
{
|
{
|
||||||
char userpass[512];
|
char userpass[768];
|
||||||
snprintf(userpass, sizeof(userpass), "%s%c%s", pool->user,
|
snprintf(userpass, sizeof(userpass), "%s%c%s", pool->user,
|
||||||
strlen(pool->pass)?':':'\0', pool->pass);
|
strlen(pool->pass)?':':'\0', pool->pass);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user