FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Wojciech Lewandowski, Windows build fixes, "These are the tweaks I had to make. JSON_Objects / json_stream headers attached. I am not sure how these will behave on VS 2010. Someone with VS 2010 should test it. Should be okay on VS 2008 and below + VS 2012 and above, though."

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14816 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-04-02 10:12:22 +00:00
parent 9aa8d641a0
commit 950d7bb60b
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/osgPlugins/osgjs/JSON_Objects
View File

@@ -19,7 +19,22 @@
#include "json_stream"
#ifdef WIN32
#include <cstdint>
#if !defined(__MINGW32__) && (!defined(_MSC_VER) || _MSC_VER<1600)
typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t;
typedef unsigned __int32 uint32_t;
typedef signed __int8 int8_t;
typedef signed __int16 int16_t;
typedef signed __int32 int32_t;
#else
#include <cstdint>
#endif
#endif
class WriteVisitor;

6
src/osgPlugins/osgjs/json_stream
View File

@@ -36,6 +36,12 @@ 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)
inline int isfinite( double x ) { return _finite( x ); }
inline int isinf( double x ) { return !_finite( x ) && !_isnan( x ); }
#endif
class json_stream : public osgDB::ofstream {
public:
json_stream(const std::string& filename, bool strict=true) :