From 1c61329e6756c15b50fe3fca755c96e2b41fdec5 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Tue, 18 Dec 2012 15:13:41 +0000 Subject: [PATCH 1/2] Fix compilation in Linux --- library/PolyVoxCore/include/PolyVoxCore/RawVolume.inl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/PolyVoxCore/include/PolyVoxCore/RawVolume.inl b/library/PolyVoxCore/include/PolyVoxCore/RawVolume.inl index 1fafad5a..8a0a2e34 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/RawVolume.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/RawVolume.inl @@ -31,7 +31,7 @@ namespace PolyVox RawVolume::RawVolume(const Region& regValid) :BaseVolume(regValid) { - setBorderValue(VoxelType()); + this->setBorderValue(VoxelType()); //Create a volume of the right size. initialise(regValid); From b71b4dd032f47fd88b904290cc6ddc6d08ca1b69 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Wed, 19 Dec 2012 16:14:31 +0000 Subject: [PATCH 2/2] Undefine POLYVOX_DEPRECATED when compiling with SWIG We want to wrap the deprecated functions but we don't want to be told off for it. See issue #19 --- library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h index 1bbfa07b..96173233 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h @@ -44,6 +44,13 @@ freely, subject to the following restrictions: #endif #endif +#if defined SWIG + //Do nothing in this case +#else + #undef POLYVOX_DEPRECATED + #define POLYVOX_DEPRECATED //Define it to nothing to avoid warnings +#endif + // Now we use the generic helper definitions above to define POLYVOX_API and POLYVOX_LOCAL. // POLYVOX_API is used for the public API symbols. It either imports or exports (or does nothing for static build) // POLYVOX_LOCAL is used for non-api symbols.