Accepted GCC fix.
This commit is contained in:
parent
2f084686f0
commit
86f3f7e644
@ -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>& 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>& operator=(const Array<1, ElementType>& rhs)
|
||||||
{
|
{
|
||||||
//Not implemented
|
//Not implemented
|
||||||
assert(false);
|
assert(false);
|
||||||
@ -329,4 +329,3 @@ namespace PolyVox
|
|||||||
#include "Array.inl"
|
#include "Array.inl"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -46,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(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)
|
||||||
@ -70,10 +70,9 @@ 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(ElementType * pElements, uint32_t * pDimensions, uint32_t * /*pOffsets*/)
|
||||||
:m_pDimensions(pDimensions)
|
:m_pDimensions(pDimensions)
|
||||||
,m_pElements(pElements)
|
,m_pElements(pElements)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}//namespace PolyVox
|
}//namespace PolyVox
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user