From 2f2475ad0ccb0398ed945d944915e0c2704a8c47 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Thu, 4 Jul 2013 22:05:06 +0100 Subject: [PATCH] Avoid ambiguous function resolution of getVoxelImpl Clang was complaining that the function couldn't access the *Volumes*'s ``getVoxelImpl``. Since we actually want the ``BaseVolume::Sampler``'s version this solves the problem. --- library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl | 2 +- library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl | 2 +- library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl b/library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl index 33acc503..0d71a68f 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl @@ -88,7 +88,7 @@ namespace PolyVox } else { - return getVoxelImpl(this->mXPosInVolume, this->mYPosInVolume, this->mZPosInVolume); + return this->getVoxelImpl(this->mXPosInVolume, this->mYPosInVolume, this->mZPosInVolume); } } diff --git a/library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl b/library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl index 6de3f3df..7460c19c 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl @@ -51,7 +51,7 @@ namespace PolyVox } else { - return getVoxelImpl(this->mXPosInVolume, this->mYPosInVolume, this->mZPosInVolume); + return this->getVoxelImpl(this->mXPosInVolume, this->mYPosInVolume, this->mZPosInVolume); } } diff --git a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl index a4892f26..6cf16bef 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl @@ -94,7 +94,7 @@ namespace PolyVox } else { - return getVoxelImpl(this->mXPosInVolume, this->mYPosInVolume, this->mZPosInVolume); + return this->getVoxelImpl(this->mXPosInVolume, this->mYPosInVolume, this->mZPosInVolume); } }