From 89550fcd446ed13dfc0ac35f45a069b8fe068d43 Mon Sep 17 00:00:00 2001
From: David Williams <david@volumesoffun.com>
Date: Thu, 5 Mar 2015 00:04:22 +0100
Subject: [PATCH] Fixed warnings.

---
 include/PolyVox/Impl/Timer.h    | 4 ++--
 include/PolyVox/PagedVolume.h   | 2 +-
 include/PolyVox/PagedVolume.inl | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/PolyVox/Impl/Timer.h b/include/PolyVox/Impl/Timer.h
index 9ad25bc6..20d3a36b 100644
--- a/include/PolyVox/Impl/Timer.h
+++ b/include/PolyVox/Impl/Timer.h
@@ -52,13 +52,13 @@ namespace PolyVox
 			return elapsed_seconds.count();
 		}
 
-		uint32_t elapsedTimeInMilliSeconds(void)
+		float elapsedTimeInMilliSeconds(void)
 		{
 			std::chrono::duration<float, std::milli> elapsed_milliseconds = clock::now() - m_start;
 			return elapsed_milliseconds.count();
 		}
 
-		uint32_t elapsedTimeInMicroSeconds(void)
+		float elapsedTimeInMicroSeconds(void)
 		{
 			std::chrono::duration<float, std::micro> elapsed_microseconds = clock::now() - m_start;
 			return elapsed_microseconds.count();
diff --git a/include/PolyVox/PagedVolume.h b/include/PolyVox/PagedVolume.h
index ddea102a..d4d13905 100644
--- a/include/PolyVox/PagedVolume.h
+++ b/include/PolyVox/PagedVolume.h
@@ -187,7 +187,7 @@ namespace PolyVox
 #if defined(_MSC_VER)
 		class Sampler : public BaseVolume<VoxelType>::Sampler< PagedVolume<VoxelType> > //This line works on VS2010
 #else
-                class Sampler : public BaseVolume<VoxelType>::template Sampler< PagedVolume<VoxelType> > //This line works on GCC
+		class Sampler : public BaseVolume<VoxelType>::template Sampler< PagedVolume<VoxelType> > //This line works on GCC
 #endif
 		{
 		public:
diff --git a/include/PolyVox/PagedVolume.inl b/include/PolyVox/PagedVolume.inl
index bf648a40..3f8b6125 100644
--- a/include/PolyVox/PagedVolume.inl
+++ b/include/PolyVox/PagedVolume.inl
@@ -80,9 +80,9 @@ namespace PolyVox
 		m_uChunkCountLimit = (std::max)(m_uChunkCountLimit, uMinPracticalNoOfChunks);
 		m_uChunkCountLimit = (std::min)(m_uChunkCountLimit, uMaxPracticalNoOfChunks);
 
-		uint32_t uChunkSizeInBytes = PagedVolume<VoxelType>::Chunk::calculateSizeInBytes(m_uChunkSideLength);
+
 		POLYVOX_LOG_DEBUG("Memory usage limit for volume initially set to " << (m_uChunkCountLimit * uChunkSizeInBytes) / (1024 * 1024)
-			<< "Mb (" << m_uChunkCountLimit << " chunks of " << uChunkSizeInBytes / 1024 << "Kb each).");
+			<< "Mb (" << m_uChunkCountLimit << " chunks of " << PagedVolume<VoxelType>::Chunk::calculateSizeInBytes(m_uChunkSideLength) / 1024 << "Kb each).");
 
 		initialise();
 	}