From bb3b69962a6cb77b658c1b1bc26941a9fee82a42 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 23 Aug 2017 14:39:35 +0100 Subject: [PATCH] Warning fixes --- src/osgPlugins/gles/GeometryIndexSplitter | 2 +- src/osgPlugins/gles/glesUtil | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgPlugins/gles/GeometryIndexSplitter b/src/osgPlugins/gles/GeometryIndexSplitter index f43c7e8a9..7d868b7f4 100644 --- a/src/osgPlugins/gles/GeometryIndexSplitter +++ b/src/osgPlugins/gles/GeometryIndexSplitter @@ -61,7 +61,7 @@ protected: } bool contains(unsigned int v1) const { - return subvertices.count(v1); + return subvertices.count(v1)!=0; } void addTriangle(unsigned int v1, unsigned int v2, unsigned v3) { diff --git a/src/osgPlugins/gles/glesUtil b/src/osgPlugins/gles/glesUtil index 746232bc0..6fab03968 100644 --- a/src/osgPlugins/gles/glesUtil +++ b/src/osgPlugins/gles/glesUtil @@ -62,7 +62,7 @@ namespace glesUtil { _geometry = target.getGeometry(); _geometry->setPrimitiveSetList(morph.getPrimitiveSetList()); - _hasTexCoord = _geometry->getTexCoordArrayList().size(); + _hasTexCoord = !_geometry->getTexCoordArrayList().empty(); if(!_hasTexCoord) { _geometry->setTexCoordArrayList(morph.getTexCoordArrayList()); }