From 221036cbd15c511cc051d6369c43fea2f85a1df8 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Wed, 7 Nov 2012 17:19:17 +0000 Subject: [PATCH] Add POLYVOX_DEPRECATED to deprecated functions --- library/PolyVoxCore/include/PolyVoxCore/Region.h | 8 ++++---- library/PolyVoxUtil/include/PolyVoxUtil/Serialization.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/library/PolyVoxCore/include/PolyVoxCore/Region.h b/library/PolyVoxCore/include/PolyVoxCore/Region.h index c12c85fa..4a11cff3 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Region.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Region.h @@ -66,17 +66,17 @@ namespace PolyVox bool containsPointInZ(int32_t pos, uint8_t boundary = 0) const; void cropTo(const Region& other); /// Deprecated and misleading - int32_t depth(void) const; + POLYVOX_DEPRECATED int32_t depth(void) const; /// Deprecated and misleading - int32_t height(void) const; + POLYVOX_DEPRECATED int32_t height(void) const; void shift(const Vector3DInt32& amount); void shiftLowerCorner(const Vector3DInt32& amount); void shiftUpperCorner(const Vector3DInt32& amount); //FIXME - Add dilate and erode functions? /// Deprecated and misleading - Vector3DInt32 dimensions(void); + POLYVOX_DEPRECATED Vector3DInt32 dimensions(void); /// Deprecated and misleading - int32_t width(void) const; + POLYVOX_DEPRECATED int32_t width(void) const; private: Vector3DInt32 m_v3dLowerCorner; diff --git a/library/PolyVoxUtil/include/PolyVoxUtil/Serialization.h b/library/PolyVoxUtil/include/PolyVoxUtil/Serialization.h index 90991821..756cc42e 100644 --- a/library/PolyVoxUtil/include/PolyVoxUtil/Serialization.h +++ b/library/PolyVoxUtil/include/PolyVoxUtil/Serialization.h @@ -44,17 +44,17 @@ namespace PolyVox //////////////////////////////////////////////////////////////////////////////// /// \deprecated Use versioned loadVolume instead template< typename VolumeType > - polyvox_shared_ptr< VolumeType > loadVolumeRaw(std::istream& stream, VolumeSerializationProgressListener* progressListener = 0); + POLYVOX_DEPRECATED polyvox_shared_ptr< VolumeType > loadVolumeRaw(std::istream& stream, VolumeSerializationProgressListener* progressListener = 0); /// \deprecated Use versioned saveVolume instead template< typename VolumeType > - void saveVolumeRaw(std::ostream& stream, VolumeType& volume, VolumeSerializationProgressListener* progressListener = 0); + POLYVOX_DEPRECATED void saveVolumeRaw(std::ostream& stream, VolumeType& volume, VolumeSerializationProgressListener* progressListener = 0); /// \deprecated Use versioned loadVolume instead template< typename VolumeType > - polyvox_shared_ptr< VolumeType > loadVolumeRle(std::istream& stream, VolumeSerializationProgressListener* progressListener = 0); + POLYVOX_DEPRECATED polyvox_shared_ptr< VolumeType > loadVolumeRle(std::istream& stream, VolumeSerializationProgressListener* progressListener = 0); /// \deprecated Use versioned saveVolume instead template< typename VolumeType > - void saveVolumeRle(std::ostream& stream, VolumeType& volume, VolumeSerializationProgressListener* progressListener = 0); + POLYVOX_DEPRECATED void saveVolumeRle(std::ostream& stream, VolumeType& volume, VolumeSerializationProgressListener* progressListener = 0); //////////////////////////////////////////////////////////////////////////////// // END OF DEPRECATED FUNCTIONS