From 149dde9460b7e46e3c54f0922e8e4aaf24ccc357 Mon Sep 17 00:00:00 2001
From: Matt Williams <matt@milliams.com>
Date: Thu, 6 Jan 2011 17:56:19 +0000
Subject: [PATCH] Fix compilation on Linux:  - The template addition is
 apparently a C++ Standard thing which is a bit of a mess but the way GCC
 interprets it requires these.  - In XOrg there is a struct called 'Region'
 which causes ambiguities. For some reason doing 'using PolyVox::Region'
 didn't fix it.

---
 examples/Basic/main.cpp                       | 2 +-
 library/PolyVoxCore/include/MeshDecimator.inl | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/Basic/main.cpp b/examples/Basic/main.cpp
index 98d777ac..a7d04005 100644
--- a/examples/Basic/main.cpp
+++ b/examples/Basic/main.cpp
@@ -159,7 +159,7 @@ int main(int argc, char *argv[])
 	createSphereInVolume(volData, 24);
 
 	//Extract the surface
-	Region region(Vector3DInt16(-1,-1,-1), Vector3DInt16(32,32,32));
+	PolyVox::Region region(Vector3DInt16(-1,-1,-1), Vector3DInt16(32,32,32));
 	SurfaceMesh<PositionMaterial> mesh;
 	//CubicSurfaceExtractor<MaterialDensityPair44> surfaceExtractor(&volData, volData.getEnclosingRegion(), &mesh);
 
diff --git a/library/PolyVoxCore/include/MeshDecimator.inl b/library/PolyVoxCore/include/MeshDecimator.inl
index 87b17e18..bedfbbdf 100644
--- a/library/PolyVoxCore/include/MeshDecimator.inl
+++ b/library/PolyVoxCore/include/MeshDecimator.inl
@@ -112,6 +112,7 @@ namespace PolyVox
 		}
 	}
 
+	template<>
 	void MeshDecimator<PositionMaterial>::fillInitialVertexMetadata(std::vector<InitialVertexMetadata>& vecVertexMetadata)
 	{
 		vecVertexMetadata.clear();
@@ -171,6 +172,7 @@ namespace PolyVox
 		}
 	}
 
+	template<>
 	void MeshDecimator<PositionMaterialNormal>::fillInitialVertexMetadata(std::vector<InitialVertexMetadata>& vecVertexMetadata)
 	{
 		vecVertexMetadata.clear();