From 535c58c9dad490dc4e7da78d6eefaba50a10753f Mon Sep 17 00:00:00 2001 From: suwatchai Date: Sat, 5 Mar 2022 02:38:06 +0700 Subject: [PATCH] Fixed compile error for FirebaseJsonArray remove. --- README.md | 6 +----- library.json | 2 +- library.properties | 2 +- media/images/stop.svg | 19 ------------------- src/Firebase_ESP_Client.h | 8 ++++---- src/README.md | 2 +- src/json/FirebaseJson.cpp | 4 ++-- src/json/FirebaseJson.h | 15 +++++++++++---- 8 files changed, 21 insertions(+), 37 deletions(-) delete mode 100644 media/images/stop.svg diff --git a/README.md b/README.md index b8ffd0654..eb60bf233 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Firebase Arduino Client Library for ESP8266 and ESP32 -Google's Firebase Arduino Client Library for ESP8266 and ESP32 v3.1.4 +Google's Firebase Arduino Client Library for ESP8266 and ESP32 v3.1.5 This library supports ESP8266 and ESP32 MCU from Espressif. The following are platforms in which the libraries are also available (RTDB only). @@ -1903,7 +1903,3 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - - -![](/media/images/stop.svg) \ No newline at end of file diff --git a/library.json b/library.json index 7bc100ca9..c5e61fcc6 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "Firebase Arduino Client Library for ESP8266 and ESP32", - "version": "3.1.4", + "version": "3.1.5", "keywords": "communication, REST, esp32, esp8266, arduino", "description": "The library supports Firebase products e.g. Realtime database, Cloud Firestore database, Firebase Storage and Google Cloud Storage, Cloud Functions for Firebase and Cloud Messaging. The library also supported other Arduino devices using Clients interfaces e.g. WiFiClient, EthernetClient, and GSMClient.", "repository": { diff --git a/library.properties b/library.properties index 972648ece..b478fc52e 100644 --- a/library.properties +++ b/library.properties @@ -1,6 +1,6 @@ name=Firebase Arduino Client Library for ESP8266 and ESP32 -version=3.1.4 +version=3.1.5 author=Mobizt diff --git a/media/images/stop.svg b/media/images/stop.svg deleted file mode 100644 index f349f8ff0..000000000 --- a/media/images/stop.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - Layer 1 - - - - - - - - - - - - - Stop The Sanctions Against RUSSIA ! - - - \ No newline at end of file diff --git a/src/Firebase_ESP_Client.h b/src/Firebase_ESP_Client.h index 41ce9ae6a..a59ebbb03 100644 --- a/src/Firebase_ESP_Client.h +++ b/src/Firebase_ESP_Client.h @@ -1,16 +1,16 @@ #ifndef FIREBASE_CLIENT_VERSION -#define FIREBASE_CLIENT_VERSION "3.1.4" +#define FIREBASE_CLIENT_VERSION "3.1.5" #endif /** - * Google's Firebase ESP Client Main class, Firebase_ESP_Client.h v3.1.4 + * Google's Firebase ESP Client Main class, Firebase_ESP_Client.h v3.1.5 * * This library supports Espressif ESP8266 and ESP32 MCUs * - * Created March 1, 2022 + * Created March 5, 2022 * * Updates: - * - Fixed legacy token authentication issue. + * - Fixed compile error for FirebaseJsonArray remove. * * * This work is a part of Firebase ESP Client library diff --git a/src/README.md b/src/README.md index d431a0283..3133f9203 100644 --- a/src/README.md +++ b/src/README.md @@ -1,7 +1,7 @@ # Firebase Arduino Client Library for ESP8266 and ESP32 -Google's Firebase Arduino Client Library for ESP8266 and ESP32 v3.1.4 +Google's Firebase Arduino Client Library for ESP8266 and ESP32 v3.1.5 The default filessystem used in the library is flash and SD. diff --git a/src/json/FirebaseJson.cpp b/src/json/FirebaseJson.cpp index 761a430a0..e9d4ccaa2 100644 --- a/src/json/FirebaseJson.cpp +++ b/src/json/FirebaseJson.cpp @@ -1,9 +1,9 @@ /* - * FirebaseJson, version 2.6.13 + * FirebaseJson, version 2.6.14 * * The Easiest Arduino library to parse, create and edit JSON object using a relative path. * - * Created February 28, 2022 + * Created March 5, 2022 * * Features * - Using path to access node element in search style e.g. json.get(result,"a/b/c") diff --git a/src/json/FirebaseJson.h b/src/json/FirebaseJson.h index 7f604297e..94092d92b 100644 --- a/src/json/FirebaseJson.h +++ b/src/json/FirebaseJson.h @@ -1,9 +1,9 @@ /* - * FirebaseJson, version 2.6.13 + * FirebaseJson, version 2.6.14 * * The Easiest Arduino library to parse, create and edit JSON object using a relative path. * - * Created February 28, 2022 + * Created March 5, 2022 * * Features * - Using path to access node element in search style e.g. json.get(result,"a/b/c") @@ -46,7 +46,14 @@ #undef max #endif #if __has_include() + +#if defined(ESP8266) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + #include + #define MB_JSON_FS_H #endif #endif @@ -2032,9 +2039,9 @@ class FirebaseJsonArray : public FirebaseJsonBase auto dataRemoveHandler(T arg) -> typename MB_ENABLE_IF::value, bool>::type { uint32_t addr = 0; - mRemove(getStr(arg, addr)); + bool ret = mRemove(getStr(arg, addr)); delAddr(addr); - return *this; + return ret; } template