coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-11-09 14:49:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Undef min for MSVC

Browse Source
This commit is contained in:
John Wellbelove 2017-09-30 18:54:19 +01:00
parent 9da7e3cd5d
commit a334e26c7c
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/deque.h
View File

@ -47,6 +47,10 @@ SOFTWARE.
#include "type_traits.h"
#include "parameter_type.h"
#ifdef ETL_COMPILER_MICROSOFT
#undef min
#endif
#undef ETL_FILE
#define ETL_FILE "1"
@ -2144,4 +2148,8 @@ bool operator >=(const etl::ideque<T>& lhs, const etl::ideque<T>& rhs)
#undef ETL_FILE
#ifdef ETL_COMPILER_MICROSOFT
#define min(a,b) (((a) < (b)) ? (a) : (b))
#endif
#endif