compilation warnings fixed

Author: sowle

contrib/epee/include/gzip_encoding.h

@@ -31,7 +31,7 @@
 #define _GZIP_ENCODING_H_
 #include "net/http_client_base.h"
 #include "zlib/zlib.h"
-//#include "http.h"
+#include <boost/core/ignore_unused.hpp>
 
 
 namespace epee
@@ -57,6 +57,7 @@ namespace net_utils
 			memset(&m_zstream_in, 0, sizeof(m_zstream_in));
 			memset(&m_zstream_out, 0, sizeof(m_zstream_out));
 			int ret = 0;
+			boost::ignore_unused(ret);
 			if(is_deflate_mode)
 			{
 				ret = inflateInit(&m_zstream_in);	

contrib/epee/include/os_defenitions.h

@@ -31,17 +31,17 @@
 
 
 // Check windows
-#if _WIN32 || _WIN64
-#if _WIN64
+#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN64)
 #define ENV64BIT
 #else
 #define ENV32BIT
 #endif
 #endif
 
 // Check GCC
-#if __GNUC__
-#if __x86_64__ || __ppc64__
+#if defined(__GNUC__)
+#if defined(__x86_64__) || defined(__ppc64__)
 #define ENV64BIT
 #else
 #define ENV32BIT

src/simplewallet/simplewallet.cpp

@@ -962,7 +962,6 @@ bool simple_wallet::transfer_impl(const std::vector<std::string> &args, uint64_t
 //----------------------------------------------------------------------------------------------------
 bool simple_wallet::transfer(const std::vector<std::string> &args_)
 {
-  bool r = false;
   if (!try_connect_to_daemon())
     return true;
 
@@ -1544,7 +1543,7 @@ bool simple_wallet::sweep_below(const std::vector<std::string> &args)
     {
       fail_msg_writer() << "address " << args[1] << " has integrated payment id " << epee::string_tools::buff_to_hex_nodelimer(integrated_payment_id) <<
         " which is incompatible with payment id " << epee::string_tools::buff_to_hex_nodelimer(payment_id) << " that was already assigned to this transfer";
-      true;
+      return true;
     }
 
     payment_id = integrated_payment_id; // remember integrated payment id as the main payment id

src/wallet/wallet2.cpp

@@ -1106,7 +1106,7 @@ void wallet2::finalize_transaction(const currency::create_tx_arg& create_tx_para
       THROW_IF_FALSE_WALLET_INT_ERR_EX(p.first < tx.vout.size(), "outs_key_images has invalid out index: " << p.first << ", tx.vout.size() = " << tx.vout.size());
       auto& out = tx.vout[p.first];
       THROW_IF_FALSE_WALLET_INT_ERR_EX(out.target.type() == typeid(txout_to_key), "outs_key_images has invalid out type, index: " << p.first);
-      const txout_to_key& otk = boost::get<const txout_to_key&>(out.target);
+      const txout_to_key& otk = boost::get<txout_to_key>(out.target);
 
       auto it = m_pending_key_images.find(otk.key);
       if (it != m_pending_key_images.end())