nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adjustments in compatibility.h for vs2010 and STLPort

Browse source 
Higher _MSC_VER.

The definitions of std::min and std::max workarounds
should be enclosed within _STLP_INTERNAL_ALGOBASE_H
because STLPort provides the fix already.
This commit is contained in:
marcello-ptr 2013-01-04 16:06:06 +01:00 • committed by Johann Dreo
commit 6ae4d1e7e5
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
eo/src/utils/compatibility.h
View file

@ -40,7 +40,7 @@
#endif #endif
#endif #endif
#if defined(_MSC_VER) && (_MSC_VER < 1300) #if defined(_MSC_VER) && (_MSC_VER <= 1600)
/* /*
Maarten: added this code here because Mirkosoft has the Maarten: added this code here because Mirkosoft has the
nasty habit of #define min and max in stdlib.h (and windows.h) nasty habit of #define min and max in stdlib.h (and windows.h)
@ -57,6 +57,8 @@ Olivier: this has been removed in .NET :) One step more standard...
#undef max // as they come in std::pairs #undef max // as they come in std::pairs
#endif #endif
#ifndef _STLP_INTERNAL_ALGOBASE_H
// add min and max to std... // add min and max to std...
namespace std namespace std
{ {
@ -77,6 +79,9 @@ namespace std
} }
} }
#endif #endif // _STLP_INTERNAL_ALGOBASE_H
// _MSC_VER
#endif // _MSC_VER
#endif #endif