adjustments in compatibility.h for vs2010 and STLPort

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

View file

@ -40,7 +40,7 @@
#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
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
#endif
#ifndef _STLP_INTERNAL_ALGOBASE_H
// add min and max to std...
namespace std
{
@ -77,6 +79,9 @@ namespace std
}
}
#endif
// _MSC_VER
#endif // _STLP_INTERNAL_ALGOBASE_H
#endif // _MSC_VER
#endif