Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2358 

0c6c3eb3 Silence stupid fallthru warning in gcc 7 (Howard Chu)
This commit is contained in:
Riccardo Spagni 2017-09-02 11:33:38 +02:00
parent d8f402ad8f 0c6c3eb3f2
commit e83666d9aa
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
external/boost/archive/portable_binary_oarchive.hpp vendored
View File

@ -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;
}

1
src/simplewallet/simplewallet.cpp
View File

@ -2431,6 +2431,7 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
break;
default:
LOG_ERROR("Unknown transfer method, using original");
/* FALLTHRU */
case TransferOriginal:
ptx_vector = m_wallet->create_transactions(dsts, fake_outs_count, 0 /* unlock_time */, priority, extra, m_trusted_daemon);
break;