Removed old deprecated code.

include/PolyVox/PagedVolume.h

@@ -197,8 +197,6 @@ namespace PolyVox
 			Sampler(PagedVolume<VoxelType>* volume);
 			~Sampler();
 
-			/// \deprecated
-			POLYVOX_DEPRECATED VoxelType getSubSampledVoxel(uint8_t uLevel) const;
 			inline VoxelType getVoxel(void) const;			
 
 			void setPosition(const Vector3DInt32& v3dNewPos);

include/PolyVox/PagedVolumeSampler.inl

@@ -56,44 +56,6 @@ namespace PolyVox
 	{
 	}
 
-	template <typename VoxelType>
-	VoxelType PagedVolume<VoxelType>::Sampler::getSubSampledVoxel(uint8_t uLevel) const
-	{		
-		if(uLevel == 0)
-		{
-			return getVoxel();
-		}
-		else if(uLevel == 1)
-		{
-			VoxelType tValue = getVoxel();
-			tValue = (std::min)(tValue, peekVoxel1px0py0pz());
-			tValue = (std::min)(tValue, peekVoxel0px1py0pz());
-			tValue = (std::min)(tValue, peekVoxel1px1py0pz());
-			tValue = (std::min)(tValue, peekVoxel0px0py1pz());
-			tValue = (std::min)(tValue, peekVoxel1px0py1pz());
-			tValue = (std::min)(tValue, peekVoxel0px1py1pz());
-			tValue = (std::min)(tValue, peekVoxel1px1py1pz());
-			return tValue;
-		}
-		else
-		{
-			const uint8_t uSize = 1 << uLevel;
-
-			VoxelType tValue = (std::numeric_limits<VoxelType>::max)();
-			for(uint8_t z = 0; z < uSize; ++z)
-			{
-				for(uint8_t y = 0; y < uSize; ++y)
-				{
-					for(uint8_t x = 0; x < uSize; ++x)
-					{
-						tValue = (std::min)(tValue, this->mVolume->getVoxel(this->mXPosInVolume + x, this->mYPosInVolume + y, this->mZPosInVolume + z));
-					}
-				}
-			}
-			return tValue;
-		}
-	}
-
 	template <typename VoxelType>
 	VoxelType PagedVolume<VoxelType>::Sampler::getVoxel(void) const
 	{

include/PolyVox/Vector.h

@@ -91,8 +91,6 @@ namespace PolyVox
         bool operator==(const Vector<Size,StorageType,OperationType>& rhs) const;
 		/// Inequality Operator.
         bool operator!=(const Vector<Size,StorageType,OperationType>& rhs) const;
-		/// Comparison Operator.
-        POLYVOX_DEPRECATED bool operator<(const Vector<Size,StorageType,OperationType>& rhs) const;
         /// Addition and Assignment Operator.
         Vector<Size,StorageType,OperationType>& operator+=(const Vector<Size,StorageType,OperationType> &rhs);
         /// Subtraction and Assignment Operator.

include/PolyVox/Vector.inl

@@ -185,28 +185,6 @@ namespace PolyVox
 		return !(*this == rhs); //Just call equality operator and invert the result.
     }   
 
-	/**
-     * Checks whether this vector is less than the parameter. The metric is
-	 * meaningless but it allows Vectors to me used as key in sdt::map, etc.
-	 * This function is deprecated. You should specify a seperate comparator to the std:map if you need one.
-     * \param rhs The Vector to compare to.
-     * \return true if this is less than the parameter
-     * \see operator!=
-	 * \deprecated
-     */
-    template <uint32_t Size, typename StorageType, typename OperationType>
-	inline bool Vector<Size, StorageType, OperationType>::operator<(const Vector<Size, StorageType, OperationType> &rhs) const
-    {
-		for(uint32_t ct = 0; ct < Size; ++ct)
-		{
-			if (m_tElements[ct] < rhs.m_tElements[ct])
-				return true;
-			if (rhs.m_tElements[ct] < m_tElements[ct])
-				return false;
-		}
-		return false;
-    }    
-
     /**
      * Addition operator adds corresponding elements of the two Vectors.
      * \param rhs The Vector to add

tests/TestVolumeSubclass.cpp

@@ -114,9 +114,6 @@ public:
 	/// Calculates approximatly how many bytes of memory the volume is currently using.
 	uint32_t calculateSizeInBytes(void) { return 0; }
 
-	/// Deprecated - I don't think we should expose this function? Let us know if you disagree...
-	//void resize(const Region& regValidRegion);
-
 private:	
 	Array<3, VoxelType> mVolumeData;
 };