aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet2.cpp
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-03-21 12:55:37 +0200
committerRiccardo Spagni <ric@spagni.net>2016-03-21 12:55:37 +0200
commit0b4e75026a36a48adaff9f6973be3ab882548599 (patch)
tree18d3ab32dfd303b6256c0571cfd9d893db858531 /src/wallet/wallet2.cpp
parentMerge pull request #738 (diff)
parentRevert "Print stack trace upon exceptions" (diff)
downloadmonero-0b4e75026a36a48adaff9f6973be3ab882548599.tar.xz
Merge pull request #740
f7301c3 Revert "Print stack trace upon exceptions" (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet2.cpp')
-rw-r--r--src/wallet/wallet2.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index ef17a770b..2afe08cb1 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -32,7 +32,6 @@
#include <boost/archive/binary_iarchive.hpp>
#include <boost/utility/value_init.hpp>
-#include "common/exception.h"
#include "include_base_utils.h"
using namespace epee;
@@ -804,7 +803,7 @@ void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched, bool& re
// handle error from async fetching thread
if (error)
{
- throw tools::runtime_error("proxy exception in refresh thread");
+ throw std::runtime_error("proxy exception in refresh thread");
}
}
catch (const std::exception&)
@@ -2013,7 +2012,7 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions(std::vector<crypto
// Throw if split_amounts comes back with a vector of size different than it should
if (split_values.size() != num_tx)
{
- throw tools::runtime_error("Splitting transactions returned a number of potential tx not equal to what was requested");
+ throw std::runtime_error("Splitting transactions returned a number of potential tx not equal to what was requested");
}
std::vector<pending_tx> ptx_vector;