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

*Keep legacy compatibility with StandardCplusplus lib (utility.h)

Make flatbuffers work with ArduinoSTL (#4357) (#4361)
*Keep legacy compatibility with StandardCplusplus lib (utility.h)
b0fa5e0f · Andrei Stoica · Wouter van Oortmerssen · 25a15950 · b0fa5e0f
Commit b0fa5e0f authored Jun 21, 2017 by Andrei Stoica Committed by Wouter van Oortmerssen Jun 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

base.h include/flatbuffers/base.h +3 -3

No files found.
--- 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>