diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-09-02 09:59:01 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-09-14 11:14:21 +0000 |
| commit | 44259e560e484350204a4c11f978cd9a6f090494 (patch) | |
| tree | 064a46fe2f66b480d71154e27058249efeaeb43d /src/common/json_util.h | |
| parent | Merge pull request #4372 (diff) | |
| download | monero-44259e560e484350204a4c11f978cd9a6f090494.tar.xz | |
wallet: ask-password can now ask without encrypting the secret spend key
Diffstat (limited to 'src/common/json_util.h')
| -rw-r--r-- | src/common/json_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/json_util.h b/src/common/json_util.h index 661022a6f..c320c3956 100644 --- a/src/common/json_util.h +++ b/src/common/json_util.h @@ -29,14 +29,14 @@ #pragma once #define GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, name, type, jtype, mandatory, def) \ - type field_##name = def; \ + type field_##name = static_cast<type>(def); \ bool field_##name##_found = false; \ (void)field_##name##_found; \ do if (json.HasMember(#name)) \ { \ if (json[#name].Is##jtype()) \ { \ - field_##name = json[#name].Get##jtype(); \ + field_##name = static_cast<type>(json[#name].Get##jtype()); \ field_##name##_found = true; \ } \ else \ |