From a9a9b64b13f9bd995458df195f9bb7124f883fc1 Mon Sep 17 00:00:00 2001
From: moneromooo-monero <moneromooo-monero@users.noreply.github.com>
Date: Thu, 2 Feb 2017 20:56:31 +0000
Subject: [PATCH 1/2] simplewallet: fix build (unqualified type not in current
 scope)

---
 src/simplewallet/simplewallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index f5e20be48..b26d0ce11 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -380,7 +380,7 @@ bool simple_wallet::change_password(const std::vector<std::string> &args)
     m_wallet->rewrite(m_wallet_file, pwd_container->password());
     m_wallet->store();
   }
-  catch (const wallet_logic_error& e)
+  catch (const tools::error::wallet_logic_error& e)
   {
     fail_msg_writer() << tr("Error with wallet rewrite: ") << e.what();
     return false;

From 347190716013369fbacb8726c892ec323d44d844 Mon Sep 17 00:00:00 2001
From: moneromooo-monero <moneromooo-monero@users.noreply.github.com>
Date: Thu, 2 Feb 2017 20:56:53 +0000
Subject: [PATCH 2/2] simplewallet: cleanup

Remove empty static function which was refactored, as well as
leftover exception testing code.
---
 src/simplewallet/simplewallet.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index b26d0ce11..694838010 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -890,10 +890,6 @@ void simple_wallet::print_seed(std::string seed)
   std::cout << seed << std::endl;
 }
 //----------------------------------------------------------------------------------------------------
-static bool is_local_daemon(const std::string &address)
-{
-}
-//----------------------------------------------------------------------------------------------------
 bool simple_wallet::init(const boost::program_options::variables_map& vm)
 {
   if (!handle_command_line(vm))
@@ -4302,7 +4298,6 @@ int main(int argc, char* argv[])
   const bool r = w.init(*vm);
   CHECK_AND_ASSERT_MES(r, 1, sw::tr("Failed to initialize wallet"));
 
-try{ throw 1; } catch(...){}
   std::vector<std::string> command = command_line::get_arg(*vm, arg_command);
   if (!command.empty())
   {