github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-10-31 16:14:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed warning "unused variable" with GCC 4.4 (issue #912)

Browse Source
This commit is contained in:
Benoit Blanchon
2019-02-28 10:22:27 +01:00
parent 1d5721f3bd
commit f342dee2b4
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -4,6 +4,7 @@ ArduinoJson: change log
HEAD
----
* Fixed warning "unused variable" with GCC 4.4 (issue #912)
* Added a clear error message for `StaticJsonBuffer` and `DynamicJsonBuffer`
v6.9.0 (2019-02-26)

15
src/ArduinoJson/Numbers/FloatTraits.hpp
View File

@@ -98,12 +98,8 @@ struct FloatTraits<T, 8 /*64bits*/> {
// we use this function to workaround platforms with single precision literals
// (for example, when -fsingle-precision-constant is passed to GCC)
static T forge(uint32_t msb, uint32_t lsb) {
union {
uint64_t integerBits;
T floatBits;
};
integerBits = (uint64_t(msb) << 32) | lsb;
return floatBits;
uint64_t bits = (uint64_t(msb) << 32) | lsb;
return *reinterpret_cast<T*>(&bits);
}
};
@@ -150,12 +146,7 @@ struct FloatTraits<T, 4 /*32bits*/> {
}
static T forge(uint32_t bits) {
union {
uint32_t integerBits;
T floatBits;
};
integerBits = bits;
return floatBits;
return *reinterpret_cast<T*>(&bits);
}
static T nan() {