fix C++17 compatibility

Sia/sia.cpp

@@ -28,11 +28,10 @@
 * This file was originally written by Colin Percival as part of the Tarsnap
 * online backup system.
 */
-#include "miner.h"
-#include "cuda_helper.h"
 #include <cstdio>
-using namespace std;
 #include <cuda_profiler_api.h>
+#include "miner.h"
+#include "cuda_helper.h"
 #include "sia.h"
 
 extern void applog_hex(void *data, int len);

api.cpp

@@ -26,11 +26,9 @@
 #include <cmath>
 #include <cstdarg>
 #include <cassert>
-using namespace std;
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "miner.h"
 #include "nvml.h"
 
 #ifndef WIN32
@@ -54,6 +52,7 @@ using namespace std;
 # define CLOSESOCKET closesocket
 # define in_addr_t uint32_t
 #endif
+#include "miner.h"
 
 #define GROUP(g) (toupper(g))
 #define PRIVGROUP GROUP('W')

ccminer.cpp

@@ -52,17 +52,12 @@
 BOOL WINAPI ConsoleHandler(DWORD);
 #endif
 
-using namespace std;
-#include "miner.h"
-
 #define PROGRAM_NAME		"ccminer"
 #define LP_SCANTIME		25
 #define MNR_BLKHDR_SZ 80
 
 double expectedblocktime(const uint32_t *target);
 
-extern void get_cuda_arch(int *version);
-extern int cuda_arch[MAX_GPUS];
 
 // from cuda.cpp
 int cuda_num_devices();
@@ -78,6 +73,11 @@ void cuda_reset_device(int thr_id, bool *init);
 nvml_handle *hnvml = NULL;
 #endif
 
+#include "miner.h"
+
+extern void get_cuda_arch(int* version);
+extern int cuda_arch[MAX_GPUS];
+
 enum workio_commands
 {
 	WC_GET_WORK,

cuda.cpp

@@ -2,7 +2,6 @@
 #include <memory.h>
 #include <cstring>
 #include <map>
-using namespace std;
 #ifndef _WIN32
 #include <unistd.h>
 #endif
@@ -17,9 +16,8 @@ using namespace std;
 #endif
 
 #include "nvml.h"
-#include "miner.h"
-
 #include "cuda_runtime.h"
+#include "miner.h"
 
 cudaDeviceProp device_props[MAX_GPUS];
 cudaStream_t gpustream[MAX_GPUS] = { 0 };

fuguecoin.cpp

@@ -1,15 +1,12 @@
 #include <string.h>
-#ifdef __cplusplus
 #include <cstdint>
-#else
-#include <stdint.h>
-#endif
 
-#include "sph/sph_fugue.h"
+#include <cuda_runtime.h>
 
+#include "sph/sph_fugue.h"
 #include "miner.h"
 #include "cuda_fugue256.h"
-#include <cuda_runtime.h>
+
 extern bool stop_mining;
 extern volatile bool mining_has_stopped[MAX_GPUS];
 

groestlcoin.cpp

@@ -6,13 +6,13 @@
 #include <stdint.h>
 #endif
 #include <openssl/sha.h>
+#include <cuda.h>
+#include <cuda_runtime.h>
 
 #include "sph/sph_groestl.h"
 #include "cuda_groestlcoin.h"
 
 #include "miner.h"
-#include <cuda.h>
-#include <cuda_runtime.h>
 extern bool stop_mining;
 extern volatile bool mining_has_stopped[MAX_GPUS];
 

miner.h

@@ -1,19 +1,12 @@
 #ifndef __MINER_H__
 #define __MINER_H__
 
-#ifndef WIN32
-#include "ccminer-config.h"
-#else
-#include "ccminer-config-win.h"
-#endif
-
 #ifdef __cplusplus
 #include <algorithm>
 #include <cstring>
 #include <cinttypes>
 #include <cstdlib>
 #include <cstddef>
-using namespace std;
 #else
 #include <string.h>
 #include <stdbool.h>
@@ -27,6 +20,12 @@ using namespace std;
 #include <jansson.h>
 #include <curl/curl.h>
 
+#ifndef WIN32
+#include "ccminer-config.h"
+#else
+#include "ccminer-config-win.h"
+#endif
+
 #ifdef WIN32
 #ifndef __cplusplus
 #define inline __inline
@@ -95,6 +94,9 @@ enum
 	LOG_RAW = 0x99
 };
 #endif
+#ifdef __cplusplus
+using namespace std;
+#endif
 
 typedef unsigned char uchar;
 

myriadgroestl.cpp

@@ -5,11 +5,11 @@
 #include <stdint.h>
 #endif
 #include <openssl/sha.h>
+#include <cuda_runtime.h>
 
 #include "sph/sph_groestl.h"
 
 #include "miner.h"
-#include <cuda_runtime.h>
 extern bool stop_mining;
 extern volatile bool mining_has_stopped[MAX_GPUS];
 

nvml.cpp

@@ -26,10 +26,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include "cuda_runtime.h"
+#include "nvml.h"
 
 #include "miner.h"
-#include "nvml.h"
-#include "cuda_runtime.h"
 
 #ifdef USE_WRAPNVML
 

nvsettings.cpp

@@ -6,16 +6,16 @@
  */
 
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h> // pid_t
-
-#include "miner.h"
-#include "nvml.h"
+#include <cstdint>
 #include "cuda_runtime.h"
+#include "nvml.h"
+#include "miner.h"
 
 #ifdef __linux__
 

qubit/qubit_luffa512.cu

@@ -20,7 +20,6 @@
 #ifdef __cplusplus
 #include <cstdint>
 #include <cstdio>
-using namespace std;
 #else
 #include <stdint.h>
 #include <stdio.h>

sph/neoscrypt-cpu.cpp

@@ -402,7 +402,7 @@ static void neoscrypt_blkcpy(void *dstp, const void *srcp, uint len) {
 static void neoscrypt_blkswp(void *blkAp, void *blkBp, uint len) {
     ulong *blkA = (ulong *) blkAp;
     ulong *blkB = (ulong *) blkBp;
-    register ulong t0, t1, t2, t3;
+    ulong t0, t1, t2, t3;
     uint i;
 
     for(i = 0; i < (len / sizeof(ulong)); i += 4) {
@@ -903,7 +903,7 @@ void neoscrypt(const uchar *password, uchar *output, uint profile) {
         r = (1 << ((profile >> 5) & 0x7));
     }
     uchar *stack;
-    stack = (uchar*)malloc(((N + 3) * r * 2 * SCRYPT_BLOCK_SIZE + stack_align)*sizeof(uchar));
+    stack = (uchar*)malloc((((size_t)N + 3) * r * 2 * SCRYPT_BLOCK_SIZE + stack_align)*sizeof(uchar));
 	if(stack == NULL)
 	{
 		applog(LOG_ERR, "Out of memory!");

sysinfos.cpp

@@ -10,8 +10,8 @@
 #include <ctype.h>
 #include <cstdlib>
 #include <cstring>
-using namespace std;
-#include "miner.h"
+#include <cstdint>
+//#include "miner.h"
 
 #ifndef WIN32
 
@@ -86,7 +86,7 @@ float cpu_temp(int core)
 #endif
 }
 
-uint32_t cpu_clock(int core)
+std::uint32_t cpu_clock(int core)
 {
 #ifdef WIN32
 	return 0;

util.cpp

@@ -31,7 +31,6 @@
 #include <netinet/tcp.h>
 #endif
 #include "elist.h"
-using namespace std;
 #include "miner.h"
 
 

x13/cuda_x13_hamsi512.cu

@@ -1,7 +1,6 @@
 #ifdef __cplusplus
 #include <cstdint>
 #include <cstdio>
-using namespace std;
 #else
 #include <stdint.h>
 #include <stdio.h>