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

From Wojciech Lewandowski, Visual Studio 2008 compatibility fix

Browse Source 
Two fixed files:

osgPlugins/osgjs/JSON_Objects
osgPlugins/stl/ReaderWriterSTL.cpp.

They did not compile with VS 2008 (recent master from Github). It looks like they defined stdint types  (missing in VS 2008) but code using them also included <osg/Types> header. Errors were caused by minor differences in signed int definitions. I just removed own definitions and added include<osg/Types> instead. It solves the problem and makes the code clearer now.
This commit is contained in:
Robert Osfield 2015-12-14 17:59:45 +00:00
parent 5675d86c9b
commit 3e23c5b22d
2 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/osgPlugins/osgjs/JSON_Objects
View File

@ -10,6 +10,7 @@
#include <osg/Light>
#include <osg/Notify>
#include <osg/PrimitiveSet>
#include <osg/Types>
#include <map>
#include <string>
@ -18,21 +19,6 @@
#include "json_stream"
#ifdef WIN32
#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 <stdint.h>
#endif
#else
#include <stdint.h>
#endif
class WriteVisitor;
struct Vec5

18
src/osgPlugins/stl/ReaderWriterSTL.cpp
View File

@ -25,6 +25,7 @@
#include <osg/Notify>
#include <osg/Endian>
#include <osg/Types>
#include <osgDB/Registry>
#include <osgDB/ReadFile>
@ -43,23 +44,6 @@
#include <sys/stat.h>
#include <string.h>
#if defined(_WIN32) && !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 <stdint.h>
#endif
#include <memory>
struct STLOptionsStruct {