From 2f084686f01433f4c695bd2ea6064cd336b659a9 Mon Sep 17 00:00:00 2001
From: Matt Williams <matt@milliams.com>
Date: Tue, 30 Mar 2010 10:52:03 +0000
Subject: [PATCH] GCC was complaining about the extra qualification here. I've
 only commented it out to make it clear what I did. I also needed to include
 cassert header to handle assert()s in templates. Fixed compilation on Linux.

---
 library/PolyVoxCore/include/Array.h                  | 7 ++++---
 library/PolyVoxCore/include/PolyVoxImpl/SubArray.inl | 9 ++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/library/PolyVoxCore/include/Array.h b/library/PolyVoxCore/include/Array.h
index decc82c9..b7d4d4b9 100644
--- a/library/PolyVoxCore/include/Array.h
+++ b/library/PolyVoxCore/include/Array.h
@@ -143,7 +143,7 @@ namespace PolyVox
 			assert(false);
 		}
 
-		Array<noOfDims, ElementType>& Array<noOfDims, ElementType>::operator=(const Array<noOfDims, ElementType>& rhs)
+		Array<noOfDims, ElementType>& /*Array<noOfDims, ElementType>::*/operator=(const Array<noOfDims, ElementType>& rhs)
 		{
 			//Not implemented
 			assert(false);
@@ -247,7 +247,7 @@ namespace PolyVox
 			assert(false);
 		}
 
-		Array<1, ElementType>& Array<1, ElementType>::operator=(const Array<1, ElementType>& rhs)
+		Array<1, ElementType>& /*Array<1, ElementType>::*/operator=(const Array<1, ElementType>& rhs)
 		{
 			//Not implemented
 			assert(false);
@@ -328,4 +328,5 @@ namespace PolyVox
 
 #include "Array.inl"
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/SubArray.inl b/library/PolyVoxCore/include/PolyVoxImpl/SubArray.inl
index 8c88890e..83b5a7e9 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/SubArray.inl
+++ b/library/PolyVoxCore/include/PolyVoxImpl/SubArray.inl
@@ -23,6 +23,8 @@ distribution.
 *******************************************************************************/
 #pragma endregion
 
+#include <cassert>
+
 namespace PolyVox
 {
 	template <uint32_t noOfDims, typename ElementType>
@@ -44,7 +46,7 @@ namespace PolyVox
 	}
 
 	template <uint32_t noOfDims, typename ElementType>
-	SubArray<noOfDims, ElementType>::SubArray<noOfDims, ElementType>(ElementType * pElements, uint32_t * pDimensions, uint32_t * pOffsets)
+	SubArray<noOfDims, ElementType>::SubArray/*<noOfDims, ElementType>*/(ElementType * pElements, uint32_t * pDimensions, uint32_t * pOffsets)
 		:m_pElements(pElements)
 		,m_pDimensions(pDimensions)
 		,m_pOffsets(pOffsets)
@@ -68,9 +70,10 @@ namespace PolyVox
 	}
 
 	template <typename ElementType>
-	SubArray<1, ElementType>::SubArray<1, ElementType>(ElementType * pElements, uint32_t * pDimensions, uint32_t * /*pOffsets*/)
+	SubArray<1, ElementType>::SubArray/*<1, ElementType>*/(ElementType * pElements, uint32_t * pDimensions, uint32_t * /*pOffsets*/)
 		:m_pDimensions(pDimensions)
 		,m_pElements(pElements)			
 	{
 	}
-}//namespace PolyVox
\ No newline at end of file
+}//namespace PolyVox
+