From b57b0b16b9fce023b0f92fc763d8e1a3ec620420 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 28 Sep 2002 07:43:04 +0000 Subject: [PATCH] Fixes for Win32 build. --- include/osg/Array | 3 +-- src/osg/IndexedGeometry.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/osg/Array b/include/osg/Array index 939a94e1d..e0ed0ba59 100644 --- a/include/osg/Array +++ b/include/osg/Array @@ -173,10 +173,9 @@ class TemplateIndexArray : public IndexArray, public std::vector virtual void accept(unsigned int index,ValueVisitor& vv) { vv.apply( (*this)[index] ); } virtual void accept(unsigned int index,ConstValueVisitor& vv) const { vv.apply( (*this)[index] );} - virtual const GLvoid* getDataPointer() const { if (!std::vector::empty()) return &front(); else return 0; } + virtual const GLvoid* getDataPointer() const { if (!empty()) return &front(); else return 0; } virtual unsigned int getNumElements() const { return size(); } - virtual bool empty() const { return std::vector::empty(); } virtual unsigned int index(unsigned int pos) const { return (*this)[pos]; } protected: diff --git a/src/osg/IndexedGeometry.cpp b/src/osg/IndexedGeometry.cpp index 6c456cf3b..1d4a2d04b 100644 --- a/src/osg/IndexedGeometry.cpp +++ b/src/osg/IndexedGeometry.cpp @@ -372,7 +372,7 @@ void IndexedGeometry::drawImmediateMode(State& state) { if (texcoordPair.second.valid()) { - if (!texcoordPair.second->getNumElements()>0) + if (texcoordPair.second->getNumElements()>0) { drawTexCoordList.push_back(new DrawMultiTexCoord(GL_TEXTURE0+unit,texcoordPair.first.get(),texcoordPair.second.get(), s_glMultiTexCoord1f, @@ -403,7 +403,7 @@ void IndexedGeometry::drawImmediateMode(State& state) { if (texcoordPair.second.valid()) { - if (!texcoordPair.second->getNumElements()>0) + if (texcoordPair.second->getNumElements()>0) { drawTextCoord = new DrawTexCoord(texcoordPair.first.get(),texcoordPair.second.get());