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

Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git

Browse Source 
Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl
This commit is contained in:
David Williams 2011-07-30 14:12:51 +01:00
commit 2e27e957a7
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ namespace PolyVox
{ {
template <typename VoxelType> template <typename VoxelType>
LargeVolume<VoxelType>::Sampler::Sampler(LargeVolume<VoxelType>* volume) LargeVolume<VoxelType>::Sampler::Sampler(LargeVolume<VoxelType>* volume)
:Volume<VoxelType>::Sampler< LargeVolume<VoxelType> >(volume) :Volume<VoxelType>::template Sampler< LargeVolume<VoxelType> >(volume)
{ {
} }

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

@ -31,7 +31,7 @@ namespace PolyVox
{ {
template <typename VoxelType> template <typename VoxelType>
RawVolume<VoxelType>::Sampler::Sampler(RawVolume<VoxelType>* volume) RawVolume<VoxelType>::Sampler::Sampler(RawVolume<VoxelType>* volume)
:Volume<VoxelType>::Sampler< RawVolume<VoxelType> >(volume) :Volume<VoxelType>::template Sampler< RawVolume<VoxelType> >(volume)
,mCurrentVoxel(0) ,mCurrentVoxel(0)
,m_bIsCurrentPositionValid(false) ,m_bIsCurrentPositionValid(false)
{ {

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

@ -35,8 +35,8 @@ freely, subject to the following restrictions:
namespace PolyVox namespace PolyVox
{ {
template <typename VoxelType> template <typename VoxelType>
SimpleVolume<VoxelType>::Sampler::Sampler(SimpleVolume<VoxelType>* volume) SimpleVolume<VoxelType>::Sampler::Sampler(SimpleVolume<VoxelType>* volume)
:Volume<VoxelType>::Sampler< SimpleVolume<VoxelType> >(volume) :Volume<VoxelType>::template Sampler< SimpleVolume<VoxelType> >(volume)
{ {
} }

2
tests/TestVolumeSubclass.cpp
View File

@ -46,7 +46,7 @@ public:
{ {
public: public:
Sampler(VolumeSubclass<VoxelType>* volume) Sampler(VolumeSubclass<VoxelType>* volume)
:Volume<VoxelType>::Sampler< VolumeSubclass<VoxelType> >(volume) :Volume<VoxelType>::template Sampler< VolumeSubclass<VoxelType> >(volume)
{ {
this->mVolume = volume; this->mVolume = volume;
} }