arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-06 05:21:22 +03:00
Code

Use min and max from std::

Browse Source
This commit is contained in:
Ivan Grokhotkov 2016-05-10 21:26:38 +08:00 committed by Ivan Grokhotkov
parent 063c2379a4
commit dfcaa1b854
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cores/esp8266/Arduino.h
View File

@ -236,7 +236,7 @@ void optimistic_yield(uint32_t interval_us);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
#include <algorithm>
#include "pgmspace.h" #include "pgmspace.h"
#include "WCharacter.h" #include "WCharacter.h"
@ -247,11 +247,8 @@ void optimistic_yield(uint32_t interval_us);
#include "Updater.h" #include "Updater.h"
#include "debug.h" #include "debug.h"
#ifndef _GLIBCXX_VECTOR using std::min;
// arduino is not compatible with std::vector using std::max;
#define min(a,b) ((a)<(b)?(a):(b))
#define max(a,b) ((a)>(b)?(a):(b))
#endif
#define _min(a,b) ((a)<(b)?(a):(b)) #define _min(a,b) ((a)<(b)?(a):(b))
#define _max(a,b) ((a)>(b)?(a):(b)) #define _max(a,b) ((a)>(b)?(a):(b))