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

Compilation works with C++0x features (set -std=c++0x in gcc and def C_PLUS_PLUS_ZERO_X_SUPPORTED)

Browse Source
This commit is contained in:
Matt Williams 2009-05-17 12:22:55 +00:00
parent 46801f1e3d
commit f6e1af1828
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/PolyVoxCore/include/PolyVoxImpl/CPlusPlusZeroXSupport.h
View File

@ -5,9 +5,8 @@
//we use the one from boost. Slightly ugly defines here - unfortunatly C++ does not support 'typedef templates'.
//Ironically 'typedef templates' are coming in the next version of C++, by which time we won't need them.
#ifdef C_PLUS_PLUS_ZERO_X_SUPPORTED
#include <stdint>
#include <shared_ptr> //Just a guess at what the standard name will be.
#include <weak_ptr> //These includes may need changing
#include <cstdint>
#include <memory> //Just a guess at what the standard name will be. may need changing
#define POLYVOX_STD_NAMESPACE std
#define POLYVOX_SHARED_PTR std::shared_ptr

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

@ -257,7 +257,7 @@ namespace PolyVox
mVoxelIndexInBlock = mXPosInBlock +
mYPosInBlock * mVolume.m_uBlockSideLength +
mZPosInBlock * mVolume.m_uBlockSideLength * mVolume.m_uBlockSideLength;
boost::shared_ptr< Block<VoxelType> > currentBlock = mVolume.m_pBlocks[mBlockIndexInVolume];
POLYVOX_SHARED_PTR< Block<VoxelType> > currentBlock = mVolume.m_pBlocks[mBlockIndexInVolume];
mCurrentVoxel = currentBlock->m_tData + mVoxelIndexInBlock;
mYPosInBlock++;