Merge bitcoin#454: Fix two Omni Core related build warnings

1773613 Fix two Omni Core related build warnings (dexX7)
zathras-crypto · Jan 24, 2017 · c01dae8 · c01dae8
2 parents 3022c6b + 1773613
commit c01dae8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/omnicore/tx.cpp b/src/omnicore/tx.cpp
@@ -1981,10 +1981,10 @@ int CMPTransaction::logicMath_Deactivation()
 
     // successful deactivation - did we deactivate the MetaDEx?  If so close out all trades
     if (feature_id == FEATURE_METADEX) {
-        int closed = MetaDEx_SHUTDOWN();
+        MetaDEx_SHUTDOWN();
     }
     if (feature_id == FEATURE_TRADEALLPAIRS) {
-        int closed = MetaDEx_SHUTDOWN_ALLPAIR();
+        MetaDEx_SHUTDOWN_ALLPAIR();
     }
 
     return 0;

diff --git a/src/omnicore/utils.cpp b/src/omnicore/utils.cpp
@@ -43,7 +43,7 @@ void PrepareObfuscatedHashes(const std::string& strSeed, int hashCount, std::str
     if (hashCount > MAX_SHA256_OBFUSCATION_TIMES) hashCount = MAX_SHA256_OBFUSCATION_TIMES;
 
     // Do only as many re-hashes as there are data packets, 255 per specification
-    for (unsigned int j = 1; j <= hashCount; ++j)
+    for (int j = 1; j <= hashCount; ++j)
     {
         SHA256(sha_input, strlen((const char *)sha_input), sha_result);
         vec_chars.resize(32);