From 53a850c671bdb7f0ac8141b9b2ef0d313b734892 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 4 Sep 2015 14:23:55 +0000 Subject: [PATCH] Fixed warning by removing redundent check git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15118 16af8721-9629-0410-8352-f15c8da7e697 --- include/osgDB/OutputStream | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/osgDB/OutputStream b/include/osgDB/OutputStream index 61c54d1d9..538ff9755 100644 --- a/include/osgDB/OutputStream +++ b/include/osgDB/OutputStream @@ -145,13 +145,13 @@ public: OutputStream& operator<<( const osg::BoundingSphered& bb ); OutputStream& operator<<( const osg::Image* img ) { writeImage(img); return *this; } - OutputStream& operator<<( const osg::Array* a ) { if (OPENSCENEGRAPH_SOVERSION>=112) writeObject(a); else writeArray(a); return *this; } - OutputStream& operator<<( const osg::PrimitiveSet* p ) { if (OPENSCENEGRAPH_SOVERSION>=112) writeObject(p); else writePrimitiveSet(p); return *this; } + OutputStream& operator<<( const osg::Array* a ) { writeObject(a); return *this; } + OutputStream& operator<<( const osg::PrimitiveSet* p ) { writeObject(p); return *this; } OutputStream& operator<<( const osg::Object* obj ) { writeObject(obj); return *this; } OutputStream& operator<<( const osg::ref_ptr& ptr ) { writeImage(ptr.get()); return *this; } - OutputStream& operator<<( const osg::ref_ptr& ptr ) { if (OPENSCENEGRAPH_SOVERSION>=112) writeObject(ptr.get()); else writeArray(ptr.get()); return *this; } - OutputStream& operator<<( const osg::ref_ptr& ptr ) { if (OPENSCENEGRAPH_SOVERSION>=112) writeObject(ptr.get()); else writePrimitiveSet(ptr.get()); return *this; } + OutputStream& operator<<( const osg::ref_ptr& ptr ) { writeObject(ptr.get()); return *this; } + OutputStream& operator<<( const osg::ref_ptr& ptr ) { writeObject(ptr.get()); return *this; } template OutputStream& operator<<( const osg::ref_ptr& ptr ) { writeObject(ptr.get()); return *this; }