From d32332d5458fdb81a2f113c48a96c22ae69c67c3 Mon Sep 17 00:00:00 2001 From: Robert Soliday Date: Thu, 27 Aug 2015 11:34:41 -0500 Subject: [PATCH] libCom/test: Fix for MSVS 2015 --- src/libCom/test/epicsExceptionTest.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libCom/test/epicsExceptionTest.cpp b/src/libCom/test/epicsExceptionTest.cpp index 53f56c32d..e69f7e927 100644 --- a/src/libCom/test/epicsExceptionTest.cpp +++ b/src/libCom/test/epicsExceptionTest.cpp @@ -35,7 +35,9 @@ const nothrow_t nothrow ; #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;