From 86f3f7e644175ca91c1ce1e538135e62ef6dd512 Mon Sep 17 00:00:00 2001 From: David Williams Date: Sun, 11 Apr 2010 23:19:58 +0000 Subject: [PATCH] Accepted GCC fix. --- library/PolyVoxCore/include/Array.h | 5 ++--- library/PolyVoxCore/include/PolyVoxImpl/SubArray.inl | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/library/PolyVoxCore/include/Array.h b/library/PolyVoxCore/include/Array.h index b7d4d4b9..ec71eddb 100644 --- a/library/PolyVoxCore/include/Array.h +++ b/library/PolyVoxCore/include/Array.h @@ -143,7 +143,7 @@ namespace PolyVox assert(false); } - Array& /*Array::*/operator=(const Array& rhs) + Array& operator=(const Array& 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>& operator=(const Array<1, ElementType>& rhs) { //Not implemented assert(false); @@ -329,4 +329,3 @@ namespace PolyVox #include "Array.inl" #endif - diff --git a/library/PolyVoxCore/include/PolyVoxImpl/SubArray.inl b/library/PolyVoxCore/include/PolyVoxImpl/SubArray.inl index 83b5a7e9..f41a0f49 100644 --- a/library/PolyVoxCore/include/PolyVoxImpl/SubArray.inl +++ b/library/PolyVoxCore/include/PolyVoxImpl/SubArray.inl @@ -46,7 +46,7 @@ namespace PolyVox } template - SubArray::SubArray/**/(ElementType * pElements, uint32_t * pDimensions, uint32_t * pOffsets) + SubArray::SubArray(ElementType * pElements, uint32_t * pDimensions, uint32_t * pOffsets) :m_pElements(pElements) ,m_pDimensions(pDimensions) ,m_pOffsets(pOffsets) @@ -70,10 +70,9 @@ namespace PolyVox } template - SubArray<1, ElementType>::SubArray/*<1, ElementType>*/(ElementType * pElements, uint32_t * pDimensions, uint32_t * /*pOffsets*/) + SubArray<1, ElementType>::SubArray(ElementType * pElements, uint32_t * pDimensions, uint32_t * /*pOffsets*/) :m_pDimensions(pDimensions) ,m_pElements(pElements) { } }//namespace PolyVox -