diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e6ea1362..eec8f613 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,7 @@ - +if(CMAKE_SYSTEM_NAME STREQL iOS) +{ + return() +} if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/src/currency_core/difficulty.cpp b/src/currency_core/difficulty.cpp index 18003b62..7e217c00 100644 --- a/src/currency_core/difficulty.cpp +++ b/src/currency_core/difficulty.cpp @@ -25,8 +25,8 @@ namespace currency { using std::vector; #if defined(_MSC_VER) -#include -#include +//#include +//#include static inline void mul(uint64_t a, uint64_t b, uint64_t &low, uint64_t &high) { boost::multiprecision::uint128_t res = boost::multiprecision::uint128_t(a) * b; diff --git a/src/currency_core/tx_pool.cpp b/src/currency_core/tx_pool.cpp index 09eb40b0..a506325c 100644 --- a/src/currency_core/tx_pool.cpp +++ b/src/currency_core/tx_pool.cpp @@ -1165,7 +1165,7 @@ namespace currency uint64_t cache_size_l1 = CACHE_SIZE; LOG_PRINT_GREEN("Using pool db file cache size(L1): " << cache_size_l1, LOG_LEVEL_0); - // remove old incompartible DB + // remove old incompatible DB const std::string old_db_folder_path = m_config_folder + "/" CURRENCY_POOLDATA_FOLDERNAME_OLD; if (boost::filesystem::exists(epee::string_encoding::utf8_to_wstring(old_db_folder_path))) { @@ -1192,8 +1192,6 @@ namespace currency res = m_db_transactions.init(TRANSACTION_POOL_CONTAINER_TRANSACTIONS); CHECK_AND_ASSERT_MES(res, false, "Unable to init db container"); -// res = m_db_key_images_set.init(TRANSACTION_POOL_CONTAINER_KEY_IMAGES); -// CHECK_AND_ASSERT_MES(res, false, "Unable to init db container"); res = m_db_black_tx_list.init(TRANSACTION_POOL_CONTAINER_BLACK_TX_LIST); CHECK_AND_ASSERT_MES(res, false, "Unable to init db container"); res = m_db_alias_names.init(TRANSACTION_POOL_CONTAINER_ALIAS_NAMES); diff --git a/src/currency_core/tx_pool.h b/src/currency_core/tx_pool.h index af140a66..c468f57e 100644 --- a/src/currency_core/tx_pool.h +++ b/src/currency_core/tx_pool.h @@ -171,7 +171,6 @@ namespace currency transactions_container m_db_transactions; hash_container m_db_black_tx_list; - //key_images_container m_db_key_images_set; aliases_container m_db_alias_names; address_to_aliases_container m_db_alias_addresses; solo_options_container m_db_solo_options; diff --git a/src/rpc/core_rpc_server.h b/src/rpc/core_rpc_server.h index 03851812..b58373dc 100644 --- a/src/rpc/core_rpc_server.h +++ b/src/rpc/core_rpc_server.h @@ -155,7 +155,6 @@ namespace currency MAP_JON_RPC ("get_current_core_tx_expiration_median", on_get_current_core_tx_expiration_median, COMMAND_RPC_GET_CURRENT_CORE_TX_EXPIRATION_MEDIAN) // MAP_JON_RPC_WE("marketplace_global_get_offers_ex", on_get_offers_ex, COMMAND_RPC_GET_OFFERS_EX) - //remote miner rpc MAP_JON_RPC_N(on_login, mining::COMMAND_RPC_LOGIN) MAP_JON_RPC_N(on_getjob, mining::COMMAND_RPC_GETJOB) diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 19d8ee78..335d024a 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -53,7 +53,7 @@ namespace tools //------------------------------------------------------------------------------------------------------------------------------ bool wallet_rpc_server::run(bool do_mint, bool offline_mode, const currency::account_public_address& miner_address) { - static const uint64_t wallet_rpt_idle_work_period_ms = 2000; + static const uint64_t wallet_rpc_idle_work_period_ms = 2000; m_do_mint = do_mint; @@ -97,7 +97,7 @@ namespace tools } return true; - }, wallet_rpt_idle_work_period_ms); + }, wallet_rpc_idle_work_period_ms); } //DO NOT START THIS SERVER IN MORE THEN 1 THREADS WITHOUT REFACTORING diff --git a/src/wallet/wallet_rpc_server.h b/src/wallet/wallet_rpc_server.h index 0da4f17c..95eaaad4 100644 --- a/src/wallet/wallet_rpc_server.h +++ b/src/wallet/wallet_rpc_server.h @@ -33,8 +33,6 @@ namespace tools static void init_options(boost::program_options::options_description& desc); bool init(const boost::program_options::variables_map& vm); bool run(bool do_mint, bool offline_mode, const currency::account_public_address& miner_address); - - bool handle_http_request(const epee::net_utils::http::http_request_info& query_info, epee::net_utils::http::http_response_info& response, connection_context& m_conn_context); BEGIN_URI_MAP2()