From 11f91fbbc4888aa81e4aa3d39f4046b86c22cc60 Mon Sep 17 00:00:00 2001
From: Matt Williams <matt@milliams.com>
Date: Wed, 20 Jun 2012 23:56:37 +0100
Subject: [PATCH] Fix some compiler warnings about initialisation order.

---
 library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h     | 2 +-
 .../include/PolyVoxCore/CubicSurfaceExtractorWithNormals.inl  | 4 ++--
 library/PolyVoxCore/include/PolyVoxCore/Raycast.inl           | 2 +-
 library/PolyVoxCore/include/PolyVoxImpl/Block.inl             | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
index ae74f9a2..f80e50f6 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
@@ -78,9 +78,9 @@ namespace PolyVox
 			:volume(volData)
 			,start(v3dStart)
 			,end(v3dEnd)
+			,result(listResult)
 			,connectivity(connectivity)
 			,hBias(fHBias)
-			,result(listResult)
 			,maxNumberOfNodes(uMaxNoOfNodes)
 			,isVoxelValidForPath(funcIsVoxelValidForPath)
 			,progressCallback(funcProgressCallback)
diff --git a/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.inl b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.inl
index ee4e5fce..45a45fbd 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.inl
@@ -25,11 +25,11 @@ namespace PolyVox
 {
 	template<typename VolumeType>
 	CubicSurfaceExtractorWithNormals<VolumeType>::CubicSurfaceExtractorWithNormals(VolumeType* volData, Region region, SurfaceMesh<PositionMaterialNormal>* result, polyvox_function<bool(typename VolumeType::VoxelType from, typename VolumeType::VoxelType to, float& materialToUse)> funcIsQuadNeededCallback)
-		:m_volData(volData)
+		:m_funcIsQuadNeededCallback(funcIsQuadNeededCallback)
+		,m_volData(volData)
 		,m_sampVolume(volData)
 		,m_meshCurrent(result)
 		,m_regSizeInVoxels(region)
-		,m_funcIsQuadNeededCallback(funcIsQuadNeededCallback)
 	{		
 		assert(m_funcIsQuadNeededCallback);
 	}
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Raycast.inl b/library/PolyVoxCore/include/PolyVoxCore/Raycast.inl
index 490fb064..77c79ad5 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Raycast.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/Raycast.inl
@@ -34,11 +34,11 @@ namespace PolyVox
 	template<typename VolumeType>
 	Raycast<VolumeType>::Raycast(VolumeType* volData, const Vector3DFloat& v3dStart, const Vector3DFloat& v3dDirectionAndLength, RaycastResult& result, polyvox_function<bool(const typename VolumeType::Sampler& sampler)> funcIsPassable)
 		:m_result(result)
+		,m_funcIsPassable(funcIsPassable)
 		,m_volData(volData)
 		,m_sampVolume(volData)
 		,m_v3dStart(v3dStart)
 		,m_v3dDirectionAndLength(v3dDirectionAndLength)
-		,m_funcIsPassable(funcIsPassable)
 	{
 	}
 
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/Block.inl b/library/PolyVoxCore/include/PolyVoxImpl/Block.inl
index 147e8fab..6e5d942d 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/Block.inl
+++ b/library/PolyVoxCore/include/PolyVoxImpl/Block.inl
@@ -33,9 +33,9 @@ namespace PolyVox
 {
 	template <typename VoxelType>
 	Block<VoxelType>::Block(uint16_t uSideLength)
-		:m_uSideLength(0)
+		:m_tUncompressedData(0)
+		,m_uSideLength(0)
 		,m_uSideLengthPower(0)
-		,m_tUncompressedData(0)
 		,m_bIsCompressed(true)
 		,m_bIsUncompressedDataModified(true)
 	{