From 431749bd7845231edf9ef7380c0c6b14b9b3aa2b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 6 Jun 2016 14:18:43 +0100 Subject: [PATCH] Fixed VS2015 warning --- src/osgPlugins/osg/ReaderWriterOSG.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/osgPlugins/osg/ReaderWriterOSG.cpp b/src/osgPlugins/osg/ReaderWriterOSG.cpp index aceb848b3..e27abfe02 100644 --- a/src/osgPlugins/osg/ReaderWriterOSG.cpp +++ b/src/osgPlugins/osg/ReaderWriterOSG.cpp @@ -254,14 +254,13 @@ class OSGReaderWriter : public ReaderWriter fr.attach(&fin); fr.setOptions(options); - typedef std::vector NodeList; - NodeList nodeList; + osg::NodeList nodeList; // load all nodes in file, placing them in a group. while(!fr.eof()) { - Node *node = fr.readNode(); - if (node) nodeList.push_back(node); + osg::ref_ptr node = fr.readNode(); + if (node.valid()) nodeList.push_back(node); else fr.advanceOverCurrentFieldOrBlock(); }