From 321cb3769383736fcc2bf18cc8efc70ae9793171 Mon Sep 17 00:00:00 2001 From: BixBite-project <38261741+BixBite-project@users.noreply.github.com> Date: Tue, 4 Dec 2018 21:42:04 +0500 Subject: [PATCH] 0.0.1.5e release --- contrib/epee/include/net/abstract_tcp_server2.inl | 3 ++- contrib/epee/include/syncobj.h | 4 ++-- src/node_rpc/node_rpc_server_commands_defs.h | 3 +-- src/version.h | 2 +- src/wallet/api/wallet.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl index 48cb709..e23153a 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.inl +++ b/contrib/epee/include/net/abstract_tcp_server2.inl @@ -41,7 +41,8 @@ #include #include #include // TODO -#include // TODO +#include // TODO +#include #include "misc_language.h" #include "pragma_comp_defs.h" diff --git a/contrib/epee/include/syncobj.h b/contrib/epee/include/syncobj.h index 8912fc0..136905d 100644 --- a/contrib/epee/include/syncobj.h +++ b/contrib/epee/include/syncobj.h @@ -34,8 +34,8 @@ #include #include #include -#include - +#include // TODO +#include namespace epee { diff --git a/src/node_rpc/node_rpc_server_commands_defs.h b/src/node_rpc/node_rpc_server_commands_defs.h index 2490777..e86c9a4 100644 --- a/src/node_rpc/node_rpc_server_commands_defs.h +++ b/src/node_rpc/node_rpc_server_commands_defs.h @@ -294,8 +294,7 @@ struct COMMAND_NODE_RPC_GET_TRANSFER_DETAIL { KV_SERIALIZE(isFailed) KV_SERIALIZE(isPending) KV_SERIALIZE(fee) - KV_SERIALIZE(status) - + KV_SERIALIZE(status) END_KV_SERIALIZE_MAP() }; }; diff --git a/src/version.h b/src/version.h index 82cc3e8..52339d6 100644 --- a/src/version.h +++ b/src/version.h @@ -1,4 +1,4 @@ #define Bixbite_VERSION_TAG "release" #define Bixbite_VERSION "0.0.1.5e" -#define Bixbite_RELEASE_NAME "Violet Claim" +#define Bixbite_RELEASE_NAME "Wah Wah Mts" #define Bixbite_VERSION_FULL Bixbite_VERSION "-" Bixbite_VERSION_TAG diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index 18bdcf8..5349f71 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -1365,7 +1365,7 @@ void WalletImpl::refreshThreadFunc() // if auto refresh enabled, we wait for the "m_refreshIntervalSeconds" interval. // if not - we wait forever if (m_refreshIntervalMillis > 0) { - boost::posix_time::milliseconds wait_for_ms(m_refreshIntervalMillis); + boost::posix_time::milliseconds wait_for_ms(m_refreshIntervalMillis.load()); m_refreshCV.timed_wait(lock, wait_for_ms); } else { m_refreshCV.wait(lock);