Merge pull request #7876
5e63f6c
Ledger: member 'mode' was shadowing that of base class (mj-xmr)
This commit is contained in:
commit
adb2542a6c
|
@ -166,8 +166,6 @@ namespace hw {
|
||||||
void send_secret(const unsigned char sec[32], int &offset);
|
void send_secret(const unsigned char sec[32], int &offset);
|
||||||
void receive_secret(unsigned char sec[32], int &offset);
|
void receive_secret(unsigned char sec[32], int &offset);
|
||||||
|
|
||||||
// hw running mode
|
|
||||||
device_mode mode;
|
|
||||||
bool tx_in_progress;
|
bool tx_in_progress;
|
||||||
|
|
||||||
// map public destination key to ephemeral destination key
|
// map public destination key to ephemeral destination key
|
||||||
|
|
Loading…
Reference in New Issue