From 6273495c64ad4675eaca20b09fa8355059930d0a Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 20 Jul 2015 07:42:00 +0000 Subject: [PATCH] Changed the _MSC_VER check to <= 1700 to support VS2012. git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.4@14988 16af8721-9629-0410-8352-f15c8da7e697 --- src/osgPlugins/osgjs/json_stream | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgPlugins/osgjs/json_stream b/src/osgPlugins/osgjs/json_stream index 9c812100c..750fed322 100644 --- a/src/osgPlugins/osgjs/json_stream +++ b/src/osgPlugins/osgjs/json_stream @@ -36,7 +36,7 @@ using namespace std; // * disallow some control characters // * does not support inf or nan values -#if defined(WIN32) && !defined(__MINGW32__) && (!defined(_MSC_VER) || _MSC_VER<=1600) +#if defined(WIN32) && !defined(__MINGW32__) && (!defined(_MSC_VER) || _MSC_VER<=1700) inline int isfinite( double x ) { return _finite( x ); } inline int isinf( double x ) { return !_finite( x ) && !_isnan( x ); } #endif