Merge pull request #551 from sumoprojects/dev

[Merge] Dev to master branch (Nov 06, 2019)
sumoprojects · Nov 6, 2019 · 13d0ed4 · 13d0ed4
2 parents f318697 + db8c1a5
commit 13d0ed4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/crypto/cn_heavy_hash.hpp b/src/crypto/cn_heavy_hash.hpp
@@ -49,6 +49,9 @@
 #if defined(__x86_64__) || defined(__i386__) || defined(_M_X86) || defined(_M_X64)
 #ifdef __GNUC__
 #include <x86intrin.h>
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+#endif
 #pragma GCC target ("aes")
 #if !defined(HAS_WIN_INTRIN_API)
 #include <cpuid.h>

diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
@@ -1244,7 +1244,7 @@ namespace cryptonote
       case 0: res.pow_algorithm = "Cryptonight"; break;
       case 1: res.pow_algorithm = "CNv1 (Cryptonight variant 1)"; break;
       case 2: case 3: res.pow_algorithm = "CNv2 (Cryptonight variant 2)"; break;
-      case 4: case 5: res.pow_algorithm = "CNv4 (Cryptonight variant 4)"; break;
+      case 4: case 5: case 6: res.pow_algorithm = "CNv4 (Cryptonight variant 4)"; break;
       default: res.pow_algorithm = "I'm not sure actually"; break;
     }
     if (res.is_background_mining_enabled)