Make flatbuffers work with ArduinoSTL (#4357) (#4361)

*Keep legacy compatibility with StandardCplusplus lib (utility.h)
2017-06-21 17:26:37 +02:00
parent 25a15950f5
commit b0fa5e0f42
1 changed files with 3 additions and 3 deletions
--- a/include/flatbuffers/base.h
+++ b/include/flatbuffers/base.h
@@ -10,10 +10,10 @@
 #include <cstdlib>
 #include <cstring>
 #include <string>
-#ifndef ARDUINO
-#include <utility>
-#else
+#if defined(ARDUINO) && !defined(ARDUINOSTL_M_H)
 #include <utility.h>
+#else
+#include <utility>
 #endif
 #include <type_traits>
 #include <vector>