From b23316838ae30500947ce3d92f55191d2ac87ba4 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 27 Sep 2007 10:47:15 +0000 Subject: [PATCH] From Mathias Froehlich, "Some more file that needs some adjustment because of missing member templates in suns stl." --- src/osgPlugins/obj/OBJWriterNodeVisitor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgPlugins/obj/OBJWriterNodeVisitor.cpp b/src/osgPlugins/obj/OBJWriterNodeVisitor.cpp index 3becbb8f5..51a89fead 100644 --- a/src/osgPlugins/obj/OBJWriterNodeVisitor.cpp +++ b/src/osgPlugins/obj/OBJWriterNodeVisitor.cpp @@ -465,7 +465,7 @@ std::string OBJWriterNodeVisitor::getUniqueName(const std::string& defaultvalue) name += "_" +defaultvalue; if (_nameMap.find(name) == _nameMap.end()) - _nameMap.insert(std::make_pair(name, 0)); + _nameMap.insert(std::make_pair(name, 0u)); std::stringstream ss; ss << name << "_" << _nameMap[name]; @@ -503,7 +503,7 @@ void OBJWriterNodeVisitor::processStateSet(osg::StateSet* ss) if (mat || tex) { - _materialMap.insert(std::make_pair(ss, OBJMaterial(mat, tex))); + _materialMap.insert(std::make_pair(osg::ref_ptr(ss), OBJMaterial(mat, tex))); _fout << "usemtl " << _materialMap[ss].name << std::endl; }