Skip to content

Commit

Permalink
0.0.1.5e release
Browse files Browse the repository at this point in the history
  • Loading branch information
BixBite-project committed Dec 4, 2018
1 parent 9c3f4f1 commit 321cb37
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
3 changes: 2 additions & 1 deletion contrib/epee/include/net/abstract_tcp_server2.inl
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
#include <boost/utility/value_init.hpp>
#include <boost/asio/deadline_timer.hpp>
#include <boost/date_time/posix_time/posix_time.hpp> // TODO
#include <boost/thread/v2/thread.hpp> // TODO
#include <boost/thread/thread.hpp> // TODO
#include <boost/thread/condition_variable.hpp>
#include "misc_language.h"
#include "pragma_comp_defs.h"

Expand Down
4 changes: 2 additions & 2 deletions contrib/epee/include/syncobj.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
#include <boost/thread/locks.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/recursive_mutex.hpp>
#include <boost/thread/v2/thread.hpp>

#include <boost/thread/thread.hpp> // TODO
#include <boost/thread/condition_variable.hpp>
namespace epee
{

Expand Down
3 changes: 1 addition & 2 deletions src/node_rpc/node_rpc_server_commands_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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()
};
};
Expand Down
2 changes: 1 addition & 1 deletion src/version.h
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/wallet/api/wallet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 321cb37

Please sign in to comment.