From 5e62d639fb9927256fb96863c279562526399bc9 Mon Sep 17 00:00:00 2001
From: David Williams <david@linux-4eod.site>
Date: Sat, 30 Jul 2011 12:45:32 +0100
Subject: [PATCH] Compile fixes for g++.

---
 .../PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl    | 2 +-
 library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl  | 2 +-
 .../PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl   | 4 ++--
 tests/TestVolumeSubclass.cpp                                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl b/library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl
index 052aa3e5..cd092055 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl
@@ -36,7 +36,7 @@ namespace PolyVox
 {
 	template <typename VoxelType>
 	LargeVolume<VoxelType>::Sampler::Sampler(LargeVolume<VoxelType>* volume)
-		:Volume<VoxelType>::Sampler< LargeVolume<VoxelType> >(volume)
+		:Volume<VoxelType>::template Sampler< LargeVolume<VoxelType> >(volume)
 	{
 	}
 
diff --git a/library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl b/library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl
index 431a2085..5a77a3c1 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl
@@ -31,7 +31,7 @@ namespace PolyVox
 {
 	template <typename VoxelType>
 	RawVolume<VoxelType>::Sampler::Sampler(RawVolume<VoxelType>* volume)
-		:Volume<VoxelType>::Sampler< RawVolume<VoxelType> >(volume)
+		:Volume<VoxelType>::template Sampler< RawVolume<VoxelType> >(volume)
 		,mXPosInVolume(0)
 		,mYPosInVolume(0)
 		,mZPosInVolume(0)
diff --git a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl
index 16ad76fc..855fbaf0 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl
@@ -35,8 +35,8 @@ freely, subject to the following restrictions:
 namespace PolyVox
 {
 	template <typename VoxelType>
-	SimpleVolume<VoxelType>::Sampler::Sampler(SimpleVolume<VoxelType>* volume)
-		:Volume<VoxelType>::Sampler< SimpleVolume<VoxelType> >(volume)
+	SimpleVolume<VoxelType>::Sampler::Sampler(SimpleVolume<VoxelType>* volume)
+		:Volume<VoxelType>::template Sampler< SimpleVolume<VoxelType> >(volume)
 	{
 	}
 
diff --git a/tests/TestVolumeSubclass.cpp b/tests/TestVolumeSubclass.cpp
index 2c42d954..dc6af74d 100644
--- a/tests/TestVolumeSubclass.cpp
+++ b/tests/TestVolumeSubclass.cpp
@@ -46,7 +46,7 @@ public:
 		{
 		public:
 			Sampler(VolumeSubclass<VoxelType>* volume)
-				:Volume<VoxelType>::Sampler< VolumeSubclass<VoxelType> >(volume)
+				:Volume<VoxelType>::template Sampler< VolumeSubclass<VoxelType> >(volume)
 			{
 				this->mVolume = volume;
 			}