From 03891ad6bb75be2d59b418038356b16e9674cf33 Mon Sep 17 00:00:00 2001 From: David Williams Date: Wed, 15 Apr 2009 21:21:44 +0000 Subject: [PATCH] Linux fix. --- library/PolyVoxCore/include/Volume.h | 2 +- library/PolyVoxCore/include/Volume.inl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/PolyVoxCore/include/Volume.h b/library/PolyVoxCore/include/Volume.h index e99cd24e..fc35dd96 100644 --- a/library/PolyVoxCore/include/Volume.h +++ b/library/PolyVoxCore/include/Volume.h @@ -57,7 +57,7 @@ namespace PolyVox void setVoxelAt(uint16_t uXPos, uint16_t uYPos, uint16_t uZPos, VoxelType tValue); void setVoxelAt(const Vector3DUint16& v3dPos, VoxelType tValue); - void tidyUpMemory(uint32_t uNoOfBlocksToProcess = numeric_limits::max); + void tidyUpMemory(uint32_t uNoOfBlocksToProcess = std::numeric_limits::max); bool isRegionHomogenous(const Region& region); private: diff --git a/library/PolyVoxCore/include/Volume.inl b/library/PolyVoxCore/include/Volume.inl index 73c22cb0..3a028f85 100644 --- a/library/PolyVoxCore/include/Volume.inl +++ b/library/PolyVoxCore/include/Volume.inl @@ -241,7 +241,7 @@ namespace PolyVox } //Identify and remove any homogeneous blocks which are not actually in use. - std::map > >::iterator iter = m_pHomogenousBlockData.begin(); + typename std::map > >::iterator iter = m_pHomogenousBlockData.begin(); while(iter != m_pHomogenousBlockData.end()) { if(iter->second.unique()) @@ -282,7 +282,7 @@ namespace PolyVox template POLYVOX_SHARED_PTR< BlockData > Volume::getHomogenousBlockData(VoxelType tHomogenousValue) const { - std::map > >::iterator iterResult = m_pHomogenousBlockData.find(tHomogenousValue); + typename std::map > >::iterator iterResult = m_pHomogenousBlockData.find(tHomogenousValue); if(iterResult == m_pHomogenousBlockData.end()) { Block block;