From fc3682caa6fa2a83b3308a7c069e69973147e0e3 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Sun, 22 May 2011 21:40:26 +0200 Subject: [PATCH] Add 'typename' to please GCC See http://stackoverflow.com/questions/610245/where-and-why-do-i-have-to-put-template-and-typename-on-dependent-names/613132#613132 --- .../include/PolyVoxCore/CubicSurfaceExtractor.inl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl index efc46652..d347e190 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl @@ -67,7 +67,7 @@ namespace PolyVox m_vecQuads[NegativeZ].resize(m_regSizeInVoxels.getUpperCorner().getZ() - m_regSizeInVoxels.getLowerCorner().getZ() + 2); m_vecQuads[PositiveZ].resize(m_regSizeInVoxels.getUpperCorner().getZ() - m_regSizeInVoxels.getLowerCorner().getZ() + 2); - VolumeType::Sampler volumeSampler(m_volData); + typename VolumeType::Sampler volumeSampler(m_volData); Quad quad; for(int32_t z = m_regSizeInVoxels.getLowerCorner().getZ(); z <= m_regSizeInVoxels.getUpperCorner().getZ() + 1; z++) @@ -220,8 +220,8 @@ namespace PolyVox while(performQuadMerging(listQuads)){} } - std::list::iterator iterEnd = listQuads.end(); - for(std::list::iterator quadIter = listQuads.begin(); quadIter != iterEnd; quadIter++) + typename std::list::iterator iterEnd = listQuads.end(); + for(typename std::list::iterator quadIter = listQuads.begin(); quadIter != iterEnd; quadIter++) { Quad& quad = *quadIter; m_meshCurrent->addTriangleCubic(quad.vertices[0], quad.vertices[1],quad.vertices[2]); @@ -276,9 +276,9 @@ namespace PolyVox bool CubicSurfaceExtractor::performQuadMerging(std::list& quads) { bool bDidMerge = false; - for(std::list::iterator outerIter = quads.begin(); outerIter != quads.end(); outerIter++) + for(typename std::list::iterator outerIter = quads.begin(); outerIter != quads.end(); outerIter++) { - std::list::iterator innerIter = outerIter; + typename std::list::iterator innerIter = outerIter; innerIter++; while(innerIter != quads.end()) {