diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-09-14 13:15:40 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-09-14 13:15:41 +0200 |
| commit | d74399408687e91f9ef272c47ca3661e02df715e (patch) | |
| tree | c09617c83bd1050c0ded8588d40d2bf1d6a5aaf5 /src/common | |
| parent | Merge pull request #4347 (diff) | |
| parent | wallet: ask-password can now ask without encrypting the secret spend key (diff) | |
| download | monero-d74399408687e91f9ef272c47ca3661e02df715e.tar.xz | |
Merge pull request #4324
44259e56 wallet: ask-password can now ask without encrypting the secret spend key (moneromooo-monero)
Diffstat (limited to '')
| -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 \ |