From 9503d975c1b5b4f797e321194229bd463ec9058e Mon Sep 17 00:00:00 2001
From: David Williams <david@volumesoffun.com>
Date: Wed, 31 Jul 2013 16:37:39 +0200
Subject: [PATCH] GCC compile fixes.

---
 library/PolyVoxCore/include/PolyVoxCore/BlockCompressor.h   | 1 +
 library/PolyVoxCore/include/PolyVoxCore/Impl/Block.h        | 6 +++---
 library/PolyVoxCore/include/PolyVoxCore/Impl/Block.inl      | 4 ++--
 library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl     | 2 +-
 .../PolyVoxCore/include/PolyVoxCore/RLEBlockCompressor.inl  | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/library/PolyVoxCore/include/PolyVoxCore/BlockCompressor.h b/library/PolyVoxCore/include/PolyVoxCore/BlockCompressor.h
index 21338de7..dbef7a02 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/BlockCompressor.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/BlockCompressor.h
@@ -24,6 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_BlockCompressor_H__
 #define __PolyVox_BlockCompressor_H__
 
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxCore/Impl/Block.h"
 
 namespace PolyVox
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.h
index 554bc3c2..718ee9db 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.h
@@ -37,7 +37,7 @@ namespace PolyVox
 	template <typename VoxelType>
 	class Block
 	{
-		friend LargeVolume<VoxelType>;
+		friend class LargeVolume<VoxelType>;
 
 	public:
 		Block()
@@ -65,7 +65,7 @@ namespace PolyVox
 	template <typename VoxelType>
 	class CompressedBlock : public Block<VoxelType>
 	{
-		friend LargeVolume<VoxelType>;
+		friend class LargeVolume<VoxelType>;
 
 	public:
 		CompressedBlock();
@@ -94,7 +94,7 @@ namespace PolyVox
 	template <typename VoxelType>
     class UncompressedBlock : public Block<VoxelType>
     {
-		friend LargeVolume<VoxelType>;
+		friend class LargeVolume<VoxelType>;
 
 	public:
 		UncompressedBlock(uint16_t uSideLength);
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.inl b/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.inl
index ba156ef4..279dbf0e 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.inl
@@ -80,7 +80,7 @@ namespace PolyVox
 		memcpy(m_pData, pData, uDataSizeInBytes);
 
 		// Flag as modified
-		m_bDataModified = true;
+		this->m_bDataModified = true;
 	}
 
 	template <typename VoxelType>
@@ -168,7 +168,7 @@ namespace PolyVox
 				uZPos * m_uSideLength * m_uSideLength
 			] = tValue;
 
-		m_bDataModified = true;
+		this->m_bDataModified = true;
 	}
 
 	template <typename VoxelType>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
index 7be743fd..e18568bd 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
@@ -45,7 +45,7 @@ namespace PolyVox
 	{
 		m_uBlockSideLength = uBlockSideLength;
 
-		m_pBlockCompressor = new MinizBlockCompressor();
+		m_pBlockCompressor = new MinizBlockCompressor<VoxelType>();
 		m_bIsOurCompressor = true;
 
 		m_pPager = 0;
diff --git a/library/PolyVoxCore/include/PolyVoxCore/RLEBlockCompressor.inl b/library/PolyVoxCore/include/PolyVoxCore/RLEBlockCompressor.inl
index aba87809..369fb912 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/RLEBlockCompressor.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/RLEBlockCompressor.inl
@@ -79,8 +79,8 @@ namespace PolyVox
 		{
 			// If the value is the same as the current run (and we have not
 			// reached the maximum run length) then extend the current run.
-			std::vector< Run<VoxelType> >::iterator currentRun = (vecDstDataAsRuns.end() - 1);
-			if((*pSrcDataAsType == currentRun->value) && (currentRun->length < (std::numeric_limits<Run<VoxelType>::LengthType>::max)()))
+			typename std::vector< Run< VoxelType> >::iterator currentRun = (vecDstDataAsRuns.end() - 1);
+			if((*pSrcDataAsType == currentRun->value) && (currentRun->length < (std::numeric_limits<typename Run<VoxelType>::LengthType>::max)()))
 			{
 				currentRun->length++;
 			}