From 7d40a541c967a4cd0eb6a8ead31e8f6f4973de36 Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <git@benoitblanchon.fr>
Date: Mon, 1 Jul 2019 09:07:16 +0200
Subject: [PATCH] Fix invalid conversion error on Particle Argon (closes #1035)

---
 CHANGELOG.md                                            | 1 +
 src/ArduinoJson/Deserialization/ArduinoStreamReader.hpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3aa1691..c7cec9ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ HEAD
 ----
 
 * Fixed assignment of `JsonDocument` to `JsonVariant` (issue #1023)
+* Fix invalid conversion error on Particle Argon (issue #1035)
 
 v6.11.1 (2019-06-21)
 -------
diff --git a/src/ArduinoJson/Deserialization/ArduinoStreamReader.hpp b/src/ArduinoJson/Deserialization/ArduinoStreamReader.hpp
index 0551bd41..ab264b34 100644
--- a/src/ArduinoJson/Deserialization/ArduinoStreamReader.hpp
+++ b/src/ArduinoJson/Deserialization/ArduinoStreamReader.hpp
@@ -18,7 +18,7 @@ struct ArduinoStreamReader {
 
   int read() {
     // don't use _stream.read() as it ignores the timeout
-    uint8_t c;
+    char c;
     return _stream.readBytes(&c, 1) ? c : -1;
   }
 };