From b0fa5e0f4200a18013201f72b580df2c156c8c32 Mon Sep 17 00:00:00 2001
From: Andrei Stoica <stoica.razvan.andrei@gmail.com>
Date: Wed, 21 Jun 2017 17:26:37 +0200
Subject: [PATCH] Make flatbuffers work with ArduinoSTL (#4357) (#4361)

*Keep legacy compatibility with StandardCplusplus lib (utility.h)
---
 include/flatbuffers/base.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h
index f051755d5..38127f0f4 100644
--- 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>