From f6e1af1828f6590f1295223a5df82da7cdfbb94a Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Sun, 17 May 2009 12:22:55 +0000 Subject: [PATCH] Compilation works with C++0x features (set -std=c++0x in gcc and def C_PLUS_PLUS_ZERO_X_SUPPORTED) --- .../PolyVoxCore/include/PolyVoxImpl/CPlusPlusZeroXSupport.h | 5 ++--- library/PolyVoxCore/include/VolumeIterator.inl | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/library/PolyVoxCore/include/PolyVoxImpl/CPlusPlusZeroXSupport.h b/library/PolyVoxCore/include/PolyVoxImpl/CPlusPlusZeroXSupport.h index 476b9c34..4aa8feca 100644 --- a/library/PolyVoxCore/include/PolyVoxImpl/CPlusPlusZeroXSupport.h +++ b/library/PolyVoxCore/include/PolyVoxImpl/CPlusPlusZeroXSupport.h @@ -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 - #include //Just a guess at what the standard name will be. - #include //These includes may need changing + #include + #include //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 diff --git a/library/PolyVoxCore/include/VolumeIterator.inl b/library/PolyVoxCore/include/VolumeIterator.inl index 95786ee9..d2b9e913 100644 --- a/library/PolyVoxCore/include/VolumeIterator.inl +++ b/library/PolyVoxCore/include/VolumeIterator.inl @@ -257,7 +257,7 @@ namespace PolyVox mVoxelIndexInBlock = mXPosInBlock + mYPosInBlock * mVolume.m_uBlockSideLength + mZPosInBlock * mVolume.m_uBlockSideLength * mVolume.m_uBlockSideLength; - boost::shared_ptr< Block > currentBlock = mVolume.m_pBlocks[mBlockIndexInVolume]; + POLYVOX_SHARED_PTR< Block > currentBlock = mVolume.m_pBlocks[mBlockIndexInVolume]; mCurrentVoxel = currentBlock->m_tData + mVoxelIndexInBlock; mYPosInBlock++;