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

Fixes for Win32 build related to changes in using namespace std.

Browse Source
This commit is contained in:
Robert Osfield
2001-12-14 10:47:20 +00:00
parent a4e4d4fa7c
commit 84605a5f4e
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/osgDB/FieldReader
View File

@@ -15,6 +15,7 @@
#else #else
#include <iostream> #include <iostream>
using std::istream; using std::istream;
using std::ifstream;
#endif #endif
namespace osgDB { namespace osgDB {

4
src/osgPlugins/flt/ReaderWriterATTR.cpp
View File

@@ -42,6 +42,10 @@
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#ifndef OSG_USE_IO_DOT_H
using std::ios;
#endif
typedef signed char int8; typedef signed char int8;
typedef unsigned char uint8; typedef unsigned char uint8;
typedef signed short int16; typedef signed short int16;

2
src/osgPlugins/osg/StateSet.cpp
View File

@@ -392,7 +392,7 @@ bool StateSet_writeLocalData(const Object& obj, Output& fw)
else else
{ {
// no name defined for GLMode so just pass its value to fw. // no name defined for GLMode so just pass its value to fw.
fw.indent() << "0x" << hex << (osg::uint)mitr->first << dec <<" " << StateSet_getModeStr(mitr->second) << endl; fw.indent() << "0x" << std::hex << (osg::uint)mitr->first << std::dec <<" " << StateSet_getModeStr(mitr->second) << endl;
} }
} }

4
src/osgPlugins/osg/Stencil.cpp
View File

@@ -106,13 +106,13 @@ bool Stencil_writeLocalData(const Object& obj,Output& fw)
fw.indent() << "function " << Stencil_getFuncStr(stencil.getFunction()) << endl; fw.indent() << "function " << Stencil_getFuncStr(stencil.getFunction()) << endl;
fw.indent() << "functionRef " << stencil.getFunctionRef() << endl; fw.indent() << "functionRef " << stencil.getFunctionRef() << endl;
fw.indent() << "functionMask 0x" << hex << stencil.getFunctionMask() << dec << endl; fw.indent() << "functionMask 0x" << std::hex << stencil.getFunctionMask() << std::dec << endl;
fw.indent() << "stencilFailOperation " << Stencil_getOperationStr(stencil.getStencilFailOperation()) << endl; fw.indent() << "stencilFailOperation " << Stencil_getOperationStr(stencil.getStencilFailOperation()) << endl;
fw.indent() << "stencilPassAndDepthFailOperation " << Stencil_getOperationStr(stencil.getStencilPassAndDepthFailOperation()) << endl; fw.indent() << "stencilPassAndDepthFailOperation " << Stencil_getOperationStr(stencil.getStencilPassAndDepthFailOperation()) << endl;
fw.indent() << "stencilPassAndDepthPassOperation " << Stencil_getOperationStr(stencil.getStencilPassAndDepthPassOperation()) << endl; fw.indent() << "stencilPassAndDepthPassOperation " << Stencil_getOperationStr(stencil.getStencilPassAndDepthPassOperation()) << endl;
fw.indent() << "writeMask 0x" << hex << stencil.getWriteMask() << dec << endl; fw.indent() << "writeMask 0x" << std::hex << stencil.getWriteMask() << std::dec << endl;
return true; return true;
} }