diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-03 15:09:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-03 15:09:00 +0200 |
| commit | f8484bb77d6ddf1f5078d804a8abff3d106d6cab (patch) | |
| tree | 6437c83af9590d09ac60eead1247d53890ed4565 /core | |
| parent | c1cee80829f10d32cc23067291321b049af7082d (diff) | |
| parent | 60688c3fe71f322fbf30938da47e717f9c3a0fb4 (diff) | |
Merge pull request #22672 from akien-mga/fix-warnings
Fix various warnings reported by CI in #22620
Diffstat (limited to 'core')
| -rw-r--r-- | core/io/marshalls.cpp | 2 | ||||
| -rw-r--r-- | core/ustring.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index 628019ef7f..ec430d41a9 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -868,8 +868,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo } break; case Variant::REAL: { - double d = p_variant; - float f = d; if (flags & ENCODE_FLAG_64) { if (buf) { encode_double(p_variant.operator double(), buf); diff --git a/core/ustring.cpp b/core/ustring.cpp index e46896ca85..3f073b181f 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -1828,8 +1828,8 @@ static double built_in_strtod(const C *string, /* A decimal ASCII floating-point int sign, expSign = false; double fraction, dblExp; const double *d; - register const C *p; - register int c; + const C *p; + int c; int exp = 0; /* Exponent read from "EX" field. */ int fracExp = 0; /* Exponent that derives from the fractional * part. Under normal circumstances, it is |