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

*Keep legacy compatibility with StandardCplusplus lib (utility.h)
google · Jun 21, 2017 · b0fa5e0 · b0fa5e0
1 parent 25a1595
commit b0fa5e0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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>