From d79b1006f306d79cdc26899a397ae286164d2095 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Thu, 21 Jun 2012 22:19:44 +0100 Subject: [PATCH] Remove deprecated constructor --- .../include/PolyVoxCore/LargeVolume.h | 5 ----- .../include/PolyVoxCore/LargeVolume.inl | 21 ------------------- .../include/PolyVoxCore/SimpleVolume.h | 5 ----- .../include/PolyVoxCore/SimpleVolume.inl | 21 ------------------- 4 files changed, 52 deletions(-) diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h index d6a7ecd2..3d35b1b4 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h +++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h @@ -255,11 +255,6 @@ namespace PolyVox bool bPagingEnabled = false, uint16_t uBlockSideLength = 32 ); - /// Deprecated constructor - do not use. - LargeVolume - ( - int32_t dont_use_this_constructor_1, int32_t dont_use_this_constructor_2, int32_t dont_use_this_constructor_3 - ); /// Destructor ~LargeVolume(); diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl index a7350c55..9b304686 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl @@ -48,27 +48,6 @@ namespace PolyVox initialise(Region::MaxRegion,uBlockSideLength); } - //////////////////////////////////////////////////////////////////////////////// - /// Deprecated - do not use this constructor. - //////////////////////////////////////////////////////////////////////////////// - template - LargeVolume::LargeVolume - ( - int32_t dont_use_this_constructor_1, int32_t dont_use_this_constructor_2, int32_t dont_use_this_constructor_3 - ) - { - //In earlier verions of PolyVox the constructor took three values indicating width, height, and depth. However, this - //causes confusion because these three parameters can be interpreted as two function pointers and a block size instead, - //hence calling a different constructor. And simply removing this constructor will cause confusion because existing - //code with three parameters will then always resolve to the constructor with two function pointers and a block size. - // - //Eventually this constructor will be removed, it's just here to make people change their code to the new version. - // - //IF YOU HIT THIS ASSERT/ABORT, CHANGE YOUR CODE TO USE THE CONSTRUCTOR TAKING A 'Region' INSTEAD. - assert(false); - abort(); - } - //////////////////////////////////////////////////////////////////////////////// /// This constructor creates a volume with a fixed size which is specified as a parameter. By default this constructor will not enable paging but you can override this if desired. If you do wish to enable paging then you are required to provide the call back function (see the other LargeVolume constructor). /// \param regValid Specifies the minimum and maximum valid voxel positions. diff --git a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h index f6c4c48c..5bbc6b53 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h +++ b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h @@ -145,11 +145,6 @@ namespace PolyVox const Region& regValid, uint16_t uBlockSideLength = 32 ); - /// Deprecated constructor - do not use. - SimpleVolume - ( - int32_t dont_use_this_constructor_1, int32_t dont_use_this_constructor_2, int32_t dont_use_this_constructor_3 - ); /// Destructor ~SimpleVolume(); diff --git a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl index ef274d31..efaaec6e 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl @@ -23,27 +23,6 @@ freely, subject to the following restrictions: namespace PolyVox { - //////////////////////////////////////////////////////////////////////////////// - /// Deprecated - do not use this constructor. - //////////////////////////////////////////////////////////////////////////////// - template - SimpleVolume::SimpleVolume - ( - int32_t dont_use_this_constructor_1, int32_t dont_use_this_constructor_2, int32_t dont_use_this_constructor_3 - ) - { - //In earlier verions of PolyVox the constructor took three values indicating width, height, and depth. However, this - //causes confusion because these three parameters can be interpreted as two function pointers and a block size instead, - //hence calling a different constructor. And simply removing this constructor will cause confusion because existing - //code with three parameters will then always resolve to the constructor with two function pointers and a block size. - // - //Eventually this constructor will be removed, it's just here to make people change their code to the new version. - // - //IF YOU HIT THIS ASSERT/ABORT, CHANGE YOUR CODE TO USE THE CONSTRUCTOR TAKING A 'Region' INSTEAD. - assert(false); - abort(); - } - //////////////////////////////////////////////////////////////////////////////// /// This constructor creates a volume with a fixed size which is specified as a parameter. /// \param regValid Specifies the minimum and maximum valid voxel positions.