AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

GCC was complaining about the extra qualification here. I've only commented it out to make it clear what I did.

Browse Source 
I also needed to include cassert header to handle assert()s in templates.
Fixed compilation on Linux.
This commit is contained in:
Matt Williams 2010-03-30 10:52:03 +00:00
parent 3e1c07550b
commit 2f084686f0
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/PolyVoxCore/include/Array.h
View File

@ -143,7 +143,7 @@ namespace PolyVox
assert(false); 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 //Not implemented
assert(false); assert(false);
@ -247,7 +247,7 @@ namespace PolyVox
assert(false); 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 //Not implemented
assert(false); assert(false);
@ -328,4 +328,5 @@ namespace PolyVox
#include "Array.inl" #include "Array.inl"
#endif #endif

9
library/PolyVoxCore/include/PolyVoxImpl/SubArray.inl
View File

@ -23,6 +23,8 @@ distribution.
*******************************************************************************/ *******************************************************************************/
#pragma endregion #pragma endregion
#include <cassert>
namespace PolyVox namespace PolyVox
{ {
template <uint32_t noOfDims, typename ElementType> template <uint32_t noOfDims, typename ElementType>
@ -44,7 +46,7 @@ namespace PolyVox
} }
template <uint32_t noOfDims, typename ElementType> 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_pElements(pElements)
,m_pDimensions(pDimensions) ,m_pDimensions(pDimensions)
,m_pOffsets(pOffsets) ,m_pOffsets(pOffsets)
@ -68,9 +70,10 @@ namespace PolyVox
} }
template <typename ElementType> 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_pDimensions(pDimensions)
,m_pElements(pElements) ,m_pElements(pElements)
{ {
} }
}//namespace PolyVox }//namespace PolyVox