AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Add 'typename' to please GCC

Browse Source 
See http://stackoverflow.com/questions/610245/where-and-why-do-i-have-to-put-template-and-typename-on-dependent-names/613132#613132
This commit is contained in:
Matt Williams 2011-05-22 21:40:26 +02:00
parent cb0a746b6f
commit fc3682caa6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl
View File

@ -67,7 +67,7 @@ namespace PolyVox
m_vecQuads[NegativeZ].resize(m_regSizeInVoxels.getUpperCorner().getZ() - m_regSizeInVoxels.getLowerCorner().getZ() + 2); 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); m_vecQuads[PositiveZ].resize(m_regSizeInVoxels.getUpperCorner().getZ() - m_regSizeInVoxels.getLowerCorner().getZ() + 2);
VolumeType<VoxelType>::Sampler volumeSampler(m_volData); typename VolumeType<VoxelType>::Sampler volumeSampler(m_volData);
Quad quad; Quad quad;
for(int32_t z = m_regSizeInVoxels.getLowerCorner().getZ(); z <= m_regSizeInVoxels.getUpperCorner().getZ() + 1; z++) for(int32_t z = m_regSizeInVoxels.getLowerCorner().getZ(); z <= m_regSizeInVoxels.getUpperCorner().getZ() + 1; z++)
@ -220,8 +220,8 @@ namespace PolyVox
while(performQuadMerging(listQuads)){} while(performQuadMerging(listQuads)){}
} }
std::list<Quad>::iterator iterEnd = listQuads.end(); typename std::list<Quad>::iterator iterEnd = listQuads.end();
for(std::list<Quad>::iterator quadIter = listQuads.begin(); quadIter != iterEnd; quadIter++) for(typename std::list<Quad>::iterator quadIter = listQuads.begin(); quadIter != iterEnd; quadIter++)
{ {
Quad& quad = *quadIter; Quad& quad = *quadIter;
m_meshCurrent->addTriangleCubic(quad.vertices[0], quad.vertices[1],quad.vertices[2]); m_meshCurrent->addTriangleCubic(quad.vertices[0], quad.vertices[1],quad.vertices[2]);
@ -276,9 +276,9 @@ namespace PolyVox
bool CubicSurfaceExtractor<VolumeType, VoxelType>::performQuadMerging(std::list<Quad>& quads) bool CubicSurfaceExtractor<VolumeType, VoxelType>::performQuadMerging(std::list<Quad>& quads)
{ {
bool bDidMerge = false; bool bDidMerge = false;
for(std::list<Quad>::iterator outerIter = quads.begin(); outerIter != quads.end(); outerIter++) for(typename std::list<Quad>::iterator outerIter = quads.begin(); outerIter != quads.end(); outerIter++)
{ {
std::list<Quad>::iterator innerIter = outerIter; typename std::list<Quad>::iterator innerIter = outerIter;
innerIter++; innerIter++;
while(innerIter != quads.end()) while(innerIter != quads.end())
{ {