Use min and max from std::

Nicholas3388 · Nov 5, 2017 · dfcaa1b · dfcaa1b
1 parent 063c237
commit dfcaa1b
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/cores/esp8266/Arduino.h b/cores/esp8266/Arduino.h
@@ -236,7 +236,7 @@ void optimistic_yield(uint32_t interval_us);
 #endif
 
 #ifdef __cplusplus
-
+#include <algorithm>
 #include "pgmspace.h"
 
 #include "WCharacter.h"
@@ -247,11 +247,8 @@ void optimistic_yield(uint32_t interval_us);
 #include "Updater.h"
 #include "debug.h"
 
-#ifndef _GLIBCXX_VECTOR
-// arduino is not compatible with std::vector
-#define min(a,b) ((a)<(b)?(a):(b))
-#define max(a,b) ((a)>(b)?(a):(b))
-#endif
+using std::min;
+using std::max;
 
 #define _min(a,b) ((a)<(b)?(a):(b))
 #define _max(a,b) ((a)>(b)?(a):(b))