mirror/ELFIO
1
0
Fork 0
mirror of https://github.com/serge1/ELFIO.git synced 2025-04-10 03:44:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use funny syntax to prevent min() macro in MSVS

Browse Source
This commit is contained in:
Serge Lamikhov-Center 2020-10-17 22:51:53 +03:00
parent d6338db817
commit 0826f15d0b
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elfio/elfio_dynamic.hpp
View File

@ -53,7 +53,7 @@ template <class S> class dynamic_section_accessor_template
if ( tag == DT_NULL ) if ( tag == DT_NULL )
break; break;
} }
entries_num = std::min( entries_num, i + 1 ); entries_num = (std::min)( entries_num, i + 1 );
} }
return entries_num; return entries_num;

3
tests/ELFIOTest.cpp
View File

@ -22,9 +22,6 @@ THE SOFTWARE.
#ifdef _MSC_VER #ifdef _MSC_VER
#define _SCL_SECURE_NO_WARNINGS #define _SCL_SECURE_NO_WARNINGS
// Prevent usage of min() macro when compiled with VS
#define NOMINMAX
#endif #endif
#define BOOST_TEST_MODULE ELFIO_Test #define BOOST_TEST_MODULE ELFIO_Test