From dfcaa1b85464f16156d0920dd6ddff5697ac13dc Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 10 May 2016 21:26:38 +0800 Subject: [PATCH] Use min and max from std:: --- cores/esp8266/Arduino.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cores/esp8266/Arduino.h b/cores/esp8266/Arduino.h index 90e2da25d..12286db86 100644 --- 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 #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))