Просмотр исходного кода

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

Benoit Blanchon 7 лет назад
Родитель
Сommit
20fcb99830
2 измененных файлов с 2 добавлено и 1 удалено
  1. 1 0
      CHANGELOG.md
  2. 1 1
      src/ArduinoJson/Json/JsonDeserializer.hpp

+ 1 - 0
CHANGELOG.md

@@ -6,6 +6,7 @@ HEAD
 
 
 * Fixed warning "unused variable" with GCC 4.4 (issue #912)
 * Fixed warning "unused variable" with GCC 4.4 (issue #912)
 * Fixed warning "cast  increases required alignment" (issue #914)
 * 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`
 * Added a clear error message for `StaticJsonBuffer` and `DynamicJsonBuffer`
 
 
 v6.9.0 (2019-02-26)
 v6.9.0 (2019-02-26)

+ 1 - 1
src/ArduinoJson/Json/JsonDeserializer.hpp

@@ -306,7 +306,7 @@ class JsonDeserializer {
 
 
   static inline uint8_t decodeHex(char c) {
   static inline uint8_t decodeHex(char c) {
     if (c < 'A') return uint8_t(c - '0');
     if (c < 'A') return uint8_t(c - '0');
-    c &= ~0x20;  // uppercase
+    c = char(c & ~0x20);  // uppercase
     return uint8_t(c - 'A' + 10);
     return uint8_t(c - 'A' + 10);
   }
   }