diff options
author | Riccardo Spagni <ric@spagni.net> | 2017-01-15 19:01:08 -0500 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2017-01-15 19:01:08 -0500 |
commit | ec323d8c3f61c3ca86d1ef2b604d4dd75c59e250 (patch) | |
tree | 81608ed30d766f52b253427aff59d78309114189 /src/wallet/api | |
parent | Merge pull request #1579 (diff) | |
parent | enable clang checks that were disabled (diff) | |
download | monero-ec323d8c3f61c3ca86d1ef2b604d4dd75c59e250.tar.xz |
Merge pull request #1561
d561f4ad enable clang checks that were disabled (Chris Vickio)
0aefb2f6 remove std::move from return statements (pessimizing-move warning) (Chris Vickio)
629d5b76 change counter from bool to int (deprecated-increment-bool warning) (Chris Vickio)
fb76d439 add extra braces around subobjects (missing-braces warning) (Chris Vickio)
3b6d5f25 make struct/class declarations consistent (mismatched-tags warning) (Chris Vickio)
fcf66925 remove unused fields from network_throttle (unused-private-field warning) (Chris Vickio)
296f8c16 inline unused function (for unused-function warning) (Chris Vickio)
Diffstat (limited to 'src/wallet/api')
-rw-r--r-- | src/wallet/api/address_book.h | 3 | ||||
-rw-r--r-- | src/wallet/api/transaction_history.h | 1 | ||||
-rw-r--r-- | src/wallet/api/wallet.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/wallet/api/address_book.h b/src/wallet/api/address_book.h index 33d06a078..5f72c5860 100644 --- a/src/wallet/api/address_book.h +++ b/src/wallet/api/address_book.h @@ -32,8 +32,7 @@ #include "wallet/wallet2.h" namespace Monero { - -class AddressBookRow; + class WalletImpl; class AddressBookImpl : public AddressBook diff --git a/src/wallet/api/transaction_history.h b/src/wallet/api/transaction_history.h index bd18e9440..37c9ea0e4 100644 --- a/src/wallet/api/transaction_history.h +++ b/src/wallet/api/transaction_history.h @@ -33,7 +33,6 @@ namespace Monero { -class TransactionInfo; class WalletImpl; class TransactionHistoryImpl : public TransactionHistory diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h index e26f30d70..e3df7fd01 100644 --- a/src/wallet/api/wallet.h +++ b/src/wallet/api/wallet.h @@ -134,7 +134,7 @@ private: friend class PendingTransactionImpl; friend class UnsignedTransactionImpl; friend class TransactionHistoryImpl; - friend class Wallet2CallbackImpl; + friend struct Wallet2CallbackImpl; friend class AddressBookImpl; tools::wallet2 * m_wallet; |