github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-01 00:38:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation error with Intel Galileo (issue #299)

Browse Source
This commit is contained in:
Benoit Blanchon
2016-06-06 22:10:28 +02:00
parent c705f3cfeb
commit c7d6d33e6c
4 changed files with 59 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/ArduinoJson/JsonBuffer.hpp
View File

@@ -11,12 +11,16 @@
#include <stdint.h> // for uint8_t
#include <string.h>
#include "String.hpp"
#include "JsonVariant.hpp"
#include "String.hpp"
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
#elif defined(__GNUC__)
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
#pragma GCC diagnostic push
#endif
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#endif
@@ -149,3 +153,11 @@ class JsonBuffer {
static const uint8_t DEFAULT_LIMIT = 10;
};
}
#if defined(__clang__)
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
#pragma GCC diagnostic pop
#endif
#endif