From 0c6c3eb3f220aa4c9f575ebaaacf5775a68589c5 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sun, 20 Aug 2017 15:58:06 +0100 Subject: [PATCH] Silence stupid fallthru warning in gcc 7 --- .../boost/archive/portable_binary_oarchive.hpp | 15 ++++++++++----- src/simplewallet/simplewallet.cpp | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/external/boost/archive/portable_binary_oarchive.hpp b/external/boost/archive/portable_binary_oarchive.hpp index 9ed30d064..e2dcb9456 100644 --- a/external/boost/archive/portable_binary_oarchive.hpp +++ b/external/boost/archive/portable_binary_oarchive.hpp @@ -41,19 +41,24 @@ class portable_binary_oarchive_exception : public boost::archive::archive_exception { public: - typedef enum { + enum exception_code { invalid_flags - } exception_code; - portable_binary_oarchive_exception(exception_code c = invalid_flags ) + } m_exception_code ; + portable_binary_oarchive_exception(exception_code c = invalid_flags ) : + boost::archive::archive_exception(boost::archive::archive_exception::other_exception), + m_exception_code(c) {} virtual const char *what( ) const throw( ) { const char *msg = "programmer error"; - switch(code){ + switch(m_exception_code){ case invalid_flags: msg = "cannot be both big and little endian"; + break; default: - boost::archive::archive_exception::what(); + msg = boost::archive::archive_exception::what(); + assert(false); + break; } return msg; } diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 1811eeb3c..7fa7ff257 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -2410,6 +2410,7 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vectorcreate_transactions(dsts, fake_outs_count, 0 /* unlock_time */, priority, extra, m_trusted_daemon); break;