mirror of
https://github.com/serge1/ELFIO.git
synced 2024-11-19 11:14:46 +00:00
Use funny syntax to prevent min() macro in MSVS
This commit is contained in:
parent
d6338db817
commit
0826f15d0b
@ -53,7 +53,7 @@ template <class S> class dynamic_section_accessor_template
|
||||
if ( tag == DT_NULL )
|
||||
break;
|
||||
}
|
||||
entries_num = std::min( entries_num, i + 1 );
|
||||
entries_num = (std::min)( entries_num, i + 1 );
|
||||
}
|
||||
|
||||
return entries_num;
|
||||
|
@ -22,9 +22,6 @@ THE SOFTWARE.
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#define _SCL_SECURE_NO_WARNINGS
|
||||
|
||||
// Prevent usage of min() macro when compiled with VS
|
||||
#define NOMINMAX
|
||||
#endif
|
||||
|
||||
#define BOOST_TEST_MODULE ELFIO_Test
|
||||
|
Loading…
Reference in New Issue
Block a user