Merged changes from 3.14 branch, to revno 12604

This commit is contained in:
Andrew Johnson
2015-09-18 11:51:51 -05:00
7 changed files with 29 additions and 19 deletions

View File

@@ -29,7 +29,9 @@ using namespace std;
#if defined ( _MSC_VER )
// some interesting bugs found in the MS implementation of new
# if _MSC_VER > 1310 /* this gets fixed some release after visual studio 7 we hope */
# if _MSC_VER >= 1900
static size_t unsuccessfulNewSize = numeric_limits < size_t > :: max ();
# elif _MSC_VER > 1310 /* this gets fixed some release after visual studio 7 we hope */
static const size_t unsuccessfulNewSize = numeric_limits < size_t > :: max ();
# else
static const size_t unsuccessfulNewSize = numeric_limits < size_t > :: max () - 100;