From 788c9be016ff2791dfeacf7d9f0a03bc9b5d5c9f Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <github@benoitblanchon.fr>
Date: Fri, 7 Jul 2017 23:04:42 +0200
Subject: [PATCH] Removed dependency on `PGM_P` as Particle 0.6.2 doesn't
 define it (issue #546)

---
 CHANGELOG.md                                 | 5 +++++
 src/ArduinoJson/StringTraits/FlashString.hpp | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e13daaa..b5a03ed4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 ArduinoJson: change log
 =======================
 
+HEAD
+----
+
+* Removed dependency on `PGM_P` as Particle 0.6.2 doesn't define it (issue #546)
+
 v5.11.0
 -------
 
diff --git a/src/ArduinoJson/StringTraits/FlashString.hpp b/src/ArduinoJson/StringTraits/FlashString.hpp
index 4ceb4c74..37e36b8d 100644
--- a/src/ArduinoJson/StringTraits/FlashString.hpp
+++ b/src/ArduinoJson/StringTraits/FlashString.hpp
@@ -34,15 +34,15 @@ struct StringTraits<const __FlashStringHelper*, void> {
   };
 
   static bool equals(const __FlashStringHelper* str, const char* expected) {
-    return strcmp_P(expected, (PGM_P)str) == 0;
+    return strcmp_P(expected, (const char*)str) == 0;
   }
 
   template <typename Buffer>
   static char* duplicate(const __FlashStringHelper* str, Buffer* buffer) {
     if (!str) return NULL;
-    size_t size = strlen_P((PGM_P)str) + 1;
+    size_t size = strlen_P((const char*)str) + 1;
     void* dup = buffer->alloc(size);
-    if (dup != NULL) memcpy_P(dup, (PGM_P)str, size);
+    if (dup != NULL) memcpy_P(dup, (const char*)str, size);
     return static_cast<char*>(dup);
   }