From 84605a5f4e2ffa355df53f3cee0876db0e72c44b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 14 Dec 2001 10:47:20 +0000 Subject: [PATCH] Fixes for Win32 build related to changes in using namespace std. --- include/osgDB/FieldReader | 1 + src/osgPlugins/flt/ReaderWriterATTR.cpp | 4 ++++ src/osgPlugins/osg/StateSet.cpp | 2 +- src/osgPlugins/osg/Stencil.cpp | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/osgDB/FieldReader b/include/osgDB/FieldReader index 375afa7ca..a1ac06dec 100644 --- a/include/osgDB/FieldReader +++ b/include/osgDB/FieldReader @@ -15,6 +15,7 @@ #else #include using std::istream; +using std::ifstream; #endif namespace osgDB { diff --git a/src/osgPlugins/flt/ReaderWriterATTR.cpp b/src/osgPlugins/flt/ReaderWriterATTR.cpp index f550be18e..345850275 100644 --- a/src/osgPlugins/flt/ReaderWriterATTR.cpp +++ b/src/osgPlugins/flt/ReaderWriterATTR.cpp @@ -42,6 +42,10 @@ #include #include +#ifndef OSG_USE_IO_DOT_H +using std::ios; +#endif + typedef signed char int8; typedef unsigned char uint8; typedef signed short int16; diff --git a/src/osgPlugins/osg/StateSet.cpp b/src/osgPlugins/osg/StateSet.cpp index 7fbe1b73f..8ce147cc4 100644 --- a/src/osgPlugins/osg/StateSet.cpp +++ b/src/osgPlugins/osg/StateSet.cpp @@ -392,7 +392,7 @@ bool StateSet_writeLocalData(const Object& obj, Output& fw) else { // 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; } } diff --git a/src/osgPlugins/osg/Stencil.cpp b/src/osgPlugins/osg/Stencil.cpp index 7754a4a1a..b2ff76776 100644 --- a/src/osgPlugins/osg/Stencil.cpp +++ b/src/osgPlugins/osg/Stencil.cpp @@ -106,13 +106,13 @@ bool Stencil_writeLocalData(const Object& obj,Output& fw) fw.indent() << "function " << Stencil_getFuncStr(stencil.getFunction()) << 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() << "stencilPassAndDepthFailOperation " << Stencil_getOperationStr(stencil.getStencilPassAndDepthFailOperation()) << 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; }