monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 12:09:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2316

Browse source 
0c6c3eb3 Silence stupid fallthru warning in gcc 7 (Howard Chu)
This commit is contained in:
Riccardo Spagni 2017-09-02 11:29:11 +02:00
commit eec3527e33
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 boost::archive::archive_exception
{ {
public: public:
typedef enum { enum exception_code {
invalid_flags invalid_flags
} exception_code; } m_exception_code ;
portable_binary_oarchive_exception(exception_code c = invalid_flags ) 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( ) virtual const char *what( ) const throw( )
{ {
const char *msg = "programmer error"; const char *msg = "programmer error";
switch(code){ switch(m_exception_code){
case invalid_flags: case invalid_flags:
msg = "cannot be both big and little endian"; msg = "cannot be both big and little endian";
break;
default: default:
boost::archive::archive_exception::what(); msg = boost::archive::archive_exception::what();
assert(false);
break;
} }
return msg; 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; break;
default: default:
LOG_ERROR("Unknown transfer method, using original"); LOG_ERROR("Unknown transfer method, using original");
/* FALLTHRU */
case TransferOriginal: case TransferOriginal:
ptx_vector = m_wallet->create_transactions(dsts, fake_outs_count, 0 /* unlock_time */, priority, extra, m_trusted_daemon); ptx_vector = m_wallet->create_transactions(dsts, fake_outs_count, 0 /* unlock_time */, priority, extra, m_trusted_daemon);
break; break;