diff options
author | MarcoFalke <falke.marco@gmail.com> | 2021-11-25 12:28:21 +0100 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2021-11-25 14:56:30 +0100 |
commit | fa2c991ec93bc72d276f0dcd747b3e57c246139b (patch) | |
tree | dddc7e075639d1128b8ec4137379588e969f2624 | |
parent | 76392b042e98fcdb3b7ce3c2023003910326d14e (diff) | |
download | bitcoin-fa2c991ec93bc72d276f0dcd747b3e57c246139b.tar.xz |
refactor: Use underlying type of isminetype for isminefilter
-rw-r--r-- | src/interfaces/wallet.h | 5 | ||||
-rw-r--r-- | src/wallet/ismine.h | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h index 490563426c..a56ed8802d 100644 --- a/src/interfaces/wallet.h +++ b/src/interfaces/wallet.h @@ -13,12 +13,13 @@ #include <util/message.h> #include <util/ui_change_type.h> +#include <cstdint> #include <functional> #include <map> #include <memory> -#include <stdint.h> #include <string> #include <tuple> +#include <type_traits> #include <utility> #include <vector> @@ -34,7 +35,7 @@ struct CRecipient; struct PartiallySignedTransaction; struct WalletContext; struct bilingual_str; -typedef uint8_t isminefilter; +using isminefilter = std::underlying_type<isminetype>::type; namespace interfaces { diff --git a/src/wallet/ismine.h b/src/wallet/ismine.h index 38ed7e7770..8605547cf2 100644 --- a/src/wallet/ismine.h +++ b/src/wallet/ismine.h @@ -8,8 +8,9 @@ #include <script/standard.h> -#include <stdint.h> #include <bitset> +#include <cstdint> +#include <type_traits> class CWallet; class CScript; @@ -35,8 +36,7 @@ class CScript; * ISMINE_USED: the scriptPubKey corresponds to a used address owned by the wallet user. * */ -enum isminetype : unsigned int -{ +enum isminetype : unsigned int { ISMINE_NO = 0, ISMINE_WATCH_ONLY = 1 << 0, ISMINE_SPENDABLE = 1 << 1, @@ -46,7 +46,7 @@ enum isminetype : unsigned int ISMINE_ENUM_ELEMENTS, }; /** used for bitflags of isminetype */ -typedef uint8_t isminefilter; +using isminefilter = std::underlying_type<isminetype>::type; /** * Cachable amount subdivided into watchonly and spendable parts. |