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

GCC compile fixes.

Browse Source
This commit is contained in:
David Williams 2013-07-31 16:37:39 +02:00
parent e35b58ba18
commit 9503d975c1
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/PolyVoxCore/include/PolyVoxCore/BlockCompressor.h
View File

@ -24,6 +24,7 @@ freely, subject to the following restrictions:
#ifndef __PolyVox_BlockCompressor_H__ #ifndef __PolyVox_BlockCompressor_H__
#define __PolyVox_BlockCompressor_H__ #define __PolyVox_BlockCompressor_H__
#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
#include "PolyVoxCore/Impl/Block.h" #include "PolyVoxCore/Impl/Block.h"
namespace PolyVox namespace PolyVox

6
library/PolyVoxCore/include/PolyVoxCore/Impl/Block.h
View File

@ -37,7 +37,7 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
class Block class Block
{ {
friend LargeVolume<VoxelType>; friend class LargeVolume<VoxelType>;
public: public:
Block() Block()
@ -65,7 +65,7 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
class CompressedBlock : public Block<VoxelType> class CompressedBlock : public Block<VoxelType>
{ {
friend LargeVolume<VoxelType>; friend class LargeVolume<VoxelType>;
public: public:
CompressedBlock(); CompressedBlock();
@ -94,7 +94,7 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
class UncompressedBlock : public Block<VoxelType> class UncompressedBlock : public Block<VoxelType>
{ {
friend LargeVolume<VoxelType>; friend class LargeVolume<VoxelType>;
public: public:
UncompressedBlock(uint16_t uSideLength); UncompressedBlock(uint16_t uSideLength);

4
library/PolyVoxCore/include/PolyVoxCore/Impl/Block.inl
View File

@ -80,7 +80,7 @@ namespace PolyVox
memcpy(m_pData, pData, uDataSizeInBytes); memcpy(m_pData, pData, uDataSizeInBytes);
// Flag as modified // Flag as modified
m_bDataModified = true; this->m_bDataModified = true;
} }
template <typename VoxelType> template <typename VoxelType>
@ -168,7 +168,7 @@ namespace PolyVox
uZPos * m_uSideLength * m_uSideLength uZPos * m_uSideLength * m_uSideLength
] = tValue; ] = tValue;
m_bDataModified = true; this->m_bDataModified = true;
} }
template <typename VoxelType> template <typename VoxelType>

2
library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
View File

@ -45,7 +45,7 @@ namespace PolyVox
{ {
m_uBlockSideLength = uBlockSideLength; m_uBlockSideLength = uBlockSideLength;
m_pBlockCompressor = new MinizBlockCompressor(); m_pBlockCompressor = new MinizBlockCompressor<VoxelType>();
m_bIsOurCompressor = true; m_bIsOurCompressor = true;
m_pPager = 0; m_pPager = 0;

4
library/PolyVoxCore/include/PolyVoxCore/RLEBlockCompressor.inl
View File

@ -79,8 +79,8 @@ namespace PolyVox
{ {
// If the value is the same as the current run (and we have not // If the value is the same as the current run (and we have not
// reached the maximum run length) then extend the current run. // reached the maximum run length) then extend the current run.
std::vector< Run<VoxelType> >::iterator currentRun = (vecDstDataAsRuns.end() - 1); typename std::vector< Run< VoxelType> >::iterator currentRun = (vecDstDataAsRuns.end() - 1);
if((*pSrcDataAsType == currentRun->value) && (currentRun->length < (std::numeric_limits<Run<VoxelType>::LengthType>::max)())) if((*pSrcDataAsType == currentRun->value) && (currentRun->length < (std::numeric_limits<typename Run<VoxelType>::LengthType>::max)()))
{ {
currentRun->length++; currentRun->length++;
} }