Fixed warning "conversion may alter value" (issue bblanchon#914)

bblanchon · bblanchon · commit 20fcb9983031 · 2019-03-01T09:15:43.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ HEAD
 
 * Fixed warning "unused variable" with GCC 4.4 (issue #912)
 * Fixed warning "cast  increases required alignment" (issue #914)
+* Fixed warning "conversion may alter value" (issue #914)
 * Added a clear error message for `StaticJsonBuffer` and `DynamicJsonBuffer`
 
 v6.9.0 (2019-02-26)
diff --git a/src/ArduinoJson/Json/JsonDeserializer.hpp b/src/ArduinoJson/Json/JsonDeserializer.hpp
@@ -306,7 +306,7 @@ class JsonDeserializer {
 
   static inline uint8_t decodeHex(char c) {
     if (c < 'A') return uint8_t(c - '0');
-    c &= ~0x20;  // uppercase
+    c = char(c & ~0x20);  // uppercase
     return uint8_t(c - 'A' + 10);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ class JsonDeserializer {`
`306`	`306`
`307`	`307`	`static inline uint8_t decodeHex(char c) {`
`308`	`308`	`if (c < 'A') return uint8_t(c - '0');`
`309`		`- c &= ~0x20; // uppercase`
	`309`	`+ c = char(c & ~0x20); // uppercase`
`310`	`310`	`return uint8_t(c - 'A' + 10);`
`311`	`311`	`}`
`312`	`312`