From 96a8fa1f21ef72d1567ed10550c32e415930919e Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 24 Dec 2003 19:28:39 +0000 Subject: [PATCH] Fixes for VS6.0 --- VisualStudio/examples/osgphotoalbum/osgphotoalbum.dsp | 8 ++++---- src/osg/Referenced.cpp | 2 +- src/osgPlugins/osg/FragmentProgram.cpp | 2 +- src/osgPlugins/osg/VertexProgram.cpp | 3 ++- src/osgPlugins/txp/TileMapper.cpp | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/VisualStudio/examples/osgphotoalbum/osgphotoalbum.dsp b/VisualStudio/examples/osgphotoalbum/osgphotoalbum.dsp index e66b44098..fbbe1125e 100644 --- a/VisualStudio/examples/osgphotoalbum/osgphotoalbum.dsp +++ b/VisualStudio/examples/osgphotoalbum/osgphotoalbum.dsp @@ -86,7 +86,7 @@ RSC=rc.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /Zm200 /c # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -102,7 +102,7 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgphotoalbum.exe" /libpath:"../../../lib" +# ADD LINK32 glu32.lib opengl32.lib Producer.lib OpenThreadsWin32.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgphotoalbum.exe" /libpath:"../../../lib" @@ -134,7 +134,7 @@ LINK32=link.exe # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /vd0 /GR /GX /Zi /Od /I "../../../include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /vd0 /GR /GX /Zi /Od /I "../../../include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /YX /FD /Zm200 /c # SUBTRACT CPP /Fr @@ -152,7 +152,7 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgphotoalbumd.exe" /pdbtype:sept /libpath:"../../../lib" +# ADD LINK32 glu32.lib opengl32.lib Producerd.lib OpenThreadsWin32d.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgphotoalbumd.exe" /pdbtype:sept /libpath:"../../../lib" # SUBTRACT LINK32 /incremental:no diff --git a/src/osg/Referenced.cpp b/src/osg/Referenced.cpp index 70ad4ce9c..9e27fc3ba 100644 --- a/src/osg/Referenced.cpp +++ b/src/osg/Referenced.cpp @@ -21,7 +21,7 @@ static std::auto_ptr s_deleteHandler(0); void Referenced::setDeleteHandler(DeleteHandler* handler) { - s_deleteHandler.reset(handler); +// s_deleteHandler.reset(handler); } DeleteHandler* Referenced::getDeleteHandler() diff --git a/src/osgPlugins/osg/FragmentProgram.cpp b/src/osgPlugins/osg/FragmentProgram.cpp index 46e83495e..67585fd4f 100644 --- a/src/osgPlugins/osg/FragmentProgram.cpp +++ b/src/osgPlugins/osg/FragmentProgram.cpp @@ -39,7 +39,7 @@ bool FragmentProgram_readLocalData(Object& obj, Input& fr) while (!fr.eof() && fr[0].getNoNestedBrackets() >= entry) { if (fr[0].getStr()) { code.append(std::string(fr[0].getStr())); - code.push_back('\n'); + code += '\n'; } ++fr; } diff --git a/src/osgPlugins/osg/VertexProgram.cpp b/src/osgPlugins/osg/VertexProgram.cpp index 1f4487239..c3d64f450 100644 --- a/src/osgPlugins/osg/VertexProgram.cpp +++ b/src/osgPlugins/osg/VertexProgram.cpp @@ -39,7 +39,8 @@ bool VertexProgram_readLocalData(Object& obj, Input& fr) while (!fr.eof() && fr[0].getNoNestedBrackets() >= entry) { if (fr[0].getStr()) { code.append(std::string(fr[0].getStr())); - code.push_back('\n'); + code += '\n' + ; } ++fr; } diff --git a/src/osgPlugins/txp/TileMapper.cpp b/src/osgPlugins/txp/TileMapper.cpp index eb2a6cc55..cdfc49ab6 100644 --- a/src/osgPlugins/txp/TileMapper.cpp +++ b/src/osgPlugins/txp/TileMapper.cpp @@ -27,7 +27,7 @@ void TileMapper::removePagedLOD(int x, int y, int lod) { OpenThreads::ScopedLock lock(_mutex); TileMap::iterator itr = _tileMap.find(TileTriple(x,y,lod)); - if (itr!=_tileMap.end()) return _tileMap.erase(itr); + if (itr!=_tileMap.end()) _tileMap.erase(itr); } void TileMapper::prunePagedLOD()