diff --git a/library/PolyVoxCore/include/PolyVoxCore/ConstVolumeProxy.h b/library/PolyVoxCore/include/PolyVoxCore/ConstVolumeProxy.h index cac2a282..e778bbcf 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/ConstVolumeProxy.h +++ b/library/PolyVoxCore/include/PolyVoxCore/ConstVolumeProxy.h @@ -67,7 +67,7 @@ namespace PolyVox } //Private assignment operator, so client code can't abuse this class. - ConstVolumeProxy& operator=(const ConstVolumeProxy& rhs) throw() + ConstVolumeProxy& operator=(const ConstVolumeProxy& rhs) { } diff --git a/library/PolyVoxCore/include/PolyVoxCore/Density.h b/library/PolyVoxCore/include/PolyVoxCore/Density.h index af5dab08..36e3f268 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Density.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Density.h @@ -55,17 +55,17 @@ namespace PolyVox // The LowPassFilter uses this to convert between normal and accumulated types. /// Copy constructor with cast - template explicit Density(const Density& density) throw() + template explicit Density(const Density& density) { m_uDensity = static_cast(density.getDensity()); } - bool operator==(const Density& rhs) const throw() + bool operator==(const Density& rhs) const { return (m_uDensity == rhs.m_uDensity); }; - bool operator!=(const Density& rhs) const throw() + bool operator!=(const Density& rhs) const { return !(*this == rhs); } @@ -93,7 +93,7 @@ namespace PolyVox } /// \return The current density of the voxel - Type getDensity() const throw() { return m_uDensity; } + Type getDensity() const { return m_uDensity; } /** * Set the density of the voxel * @@ -102,16 +102,16 @@ namespace PolyVox void setDensity(Type uDensity) { m_uDensity = uDensity; } /// \return The maximum allowed density of the voxel - static Type getMaxDensity() throw() { return (std::numeric_limits::max)(); } + static Type getMaxDensity() { return (std::numeric_limits::max)(); } /// \return The minimum allowed density of the voxel - static Type getMinDensity() throw() { return (std::numeric_limits::min)(); } + static Type getMinDensity() { return (std::numeric_limits::min)(); } private: Type m_uDensity; }; template - Density operator+(const Density& lhs, const Density& rhs) throw() + Density operator+(const Density& lhs, const Density& rhs) { Density result = lhs; result += rhs; @@ -119,7 +119,7 @@ namespace PolyVox } template - Density operator-(const Density& lhs, const Density& rhs) throw() + Density operator-(const Density& lhs, const Density& rhs) { Density result = lhs; result -= rhs; @@ -127,7 +127,7 @@ namespace PolyVox } template - Density operator/(const Density& lhs, uint32_t rhs) throw() + Density operator/(const Density& lhs, uint32_t rhs) { Density result = lhs; result /= rhs; diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h index d4b73740..6db673ec 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h +++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h @@ -176,7 +176,7 @@ namespace PolyVox Sampler(LargeVolume* volume); ~Sampler(); - Sampler& operator=(const Sampler& rhs) throw(); + Sampler& operator=(const Sampler& rhs); VoxelType getSubSampledVoxel(uint8_t uLevel) const; inline VoxelType getVoxel(void) const; diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl b/library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl index e9530726..69fef2a3 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl @@ -40,7 +40,7 @@ namespace PolyVox } template - typename LargeVolume::Sampler& LargeVolume::Sampler::operator=(const typename LargeVolume::Sampler& rhs) throw() + typename LargeVolume::Sampler& LargeVolume::Sampler::operator=(const typename LargeVolume::Sampler& rhs) { if(this == &rhs) { diff --git a/library/PolyVoxCore/include/PolyVoxCore/Material.h b/library/PolyVoxCore/include/PolyVoxCore/Material.h index 28ef76e2..be056afd 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Material.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Material.h @@ -48,18 +48,18 @@ namespace PolyVox Material() : m_uMaterial(0) {} Material(Type uMaterial) : m_uMaterial(uMaterial) {} - bool operator==(const Material& rhs) const throw() + bool operator==(const Material& rhs) const { return (m_uMaterial == rhs.m_uMaterial); }; - bool operator!=(const Material& rhs) const throw() + bool operator!=(const Material& rhs) const { return !(*this == rhs); } /// \return The current material value of the voxel - Type getMaterial() const throw() { return m_uMaterial; } + Type getMaterial() const { return m_uMaterial; } /** * Set the material value of the voxel * diff --git a/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h b/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h index 50233aa9..f53ce79c 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h +++ b/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h @@ -44,12 +44,12 @@ namespace PolyVox MaterialDensityPair() : m_uMaterial(0), m_uDensity(0) {} MaterialDensityPair(Type uMaterial, Type uDensity) : m_uMaterial(uMaterial), m_uDensity(uDensity) {} - bool operator==(const MaterialDensityPair& rhs) const throw() + bool operator==(const MaterialDensityPair& rhs) const { return (m_uMaterial == rhs.m_uMaterial) && (m_uDensity == rhs.m_uDensity); }; - bool operator!=(const MaterialDensityPair& rhs) const throw() + bool operator!=(const MaterialDensityPair& rhs) const { return !(*this == rhs); } @@ -72,14 +72,14 @@ namespace PolyVox return *this; } - Type getDensity() const throw() { return m_uDensity; } - Type getMaterial() const throw() { return m_uMaterial; } + Type getDensity() const { return m_uDensity; } + Type getMaterial() const { return m_uMaterial; } void setDensity(Type uDensity) { m_uDensity = uDensity; } void setMaterial(Type uMaterial) { m_uMaterial = uMaterial; } - static Type getMaxDensity() throw() { return (0x01 << NoOfDensityBits) - 1; } - static Type getMinDensity() throw() { return 0; } + static Type getMaxDensity() { return (0x01 << NoOfDensityBits) - 1; } + static Type getMinDensity() { return 0; } private: Type m_uMaterial : NoOfMaterialBits; diff --git a/library/PolyVoxCore/include/PolyVoxCore/Region.h b/library/PolyVoxCore/include/PolyVoxCore/Region.h index 4a11cff3..60657341 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Region.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Region.h @@ -45,9 +45,9 @@ namespace PolyVox Region(int32_t iLowerX, int32_t iLowerY, int32_t iLowerZ, int32_t iUpperX, int32_t iUpperY, int32_t iUpperZ); ///Equality Operator. - bool operator==(const Region& rhs) const throw(); + bool operator==(const Region& rhs) const; ///Inequality Operator. - bool operator!=(const Region& rhs) const throw(); + bool operator!=(const Region& rhs) const; const Vector3DInt32& getLowerCorner(void) const; const Vector3DInt32& getUpperCorner(void) const; diff --git a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h index b6299d64..c8b12e22 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h +++ b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h @@ -87,7 +87,7 @@ namespace PolyVox Sampler(SimpleVolume* volume); ~Sampler(); - Sampler& operator=(const Sampler& rhs) throw(); + Sampler& operator=(const Sampler& rhs); VoxelType getSubSampledVoxel(uint8_t uLevel) const; /// Get the value of the current voxel diff --git a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl index 3156c98c..83a663e7 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl @@ -43,7 +43,7 @@ namespace PolyVox } template - typename SimpleVolume::Sampler& SimpleVolume::Sampler::operator=(const typename SimpleVolume::Sampler& rhs) throw() + typename SimpleVolume::Sampler& SimpleVolume::Sampler::operator=(const typename SimpleVolume::Sampler& rhs) { if(this == &rhs) { diff --git a/library/PolyVoxCore/include/PolyVoxCore/Vector.h b/library/PolyVoxCore/include/PolyVoxCore/Vector.h index 89b4e0b7..ea81910c 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Vector.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Vector.h @@ -63,81 +63,81 @@ namespace PolyVox { public: ///Constructor. - Vector(Type x, Type y) throw(); + Vector(Type x, Type y); ///Constructor. - Vector(Type x, Type y, Type z) throw(); + Vector(Type x, Type y, Type z); ///Constructor. - Vector(Type x, Type y, Type z, Type w) throw(); + Vector(Type x, Type y, Type z, Type w); ///Constructor - Vector(void) throw(); + Vector(void); ///Copy Constructor. - Vector(const Vector& vector) throw(); + Vector(const Vector& vector); ///Copy Constructor which performs casting. - template explicit Vector(const Vector& vector) throw(); + template explicit Vector(const Vector& vector); ///Destructor. - ~Vector(void) throw(); + ~Vector(void); ///Assignment Operator. - Vector& operator=(const Vector& rhs) throw(); + Vector& operator=(const Vector& rhs); ///Equality Operator. - bool operator==(const Vector& rhs) const throw(); + bool operator==(const Vector& rhs) const; ///Inequality Operator. - bool operator!=(const Vector& rhs) const throw(); + bool operator!=(const Vector& rhs) const; ///Comparison Operator. - bool operator<(const Vector& rhs) const throw(); + bool operator<(const Vector& rhs) const; ///Addition and Assignment Operator. - Vector& operator+=(const Vector &rhs) throw(); + Vector& operator+=(const Vector &rhs); ///Subtraction and Assignment Operator. - Vector& operator-=(const Vector &rhs) throw(); + Vector& operator-=(const Vector &rhs); ///Multiplication and Assignment Operator. - Vector& operator*=(const Vector &rhs) throw(); + Vector& operator*=(const Vector &rhs); ///Division and Assignment Operator. - Vector& operator/=(const Vector &rhs) throw(); + Vector& operator/=(const Vector &rhs); ///Multiplication and Assignment Operator. - Vector& operator*=(const Type& rhs) throw(); + Vector& operator*=(const Type& rhs); ///Division and Assignment Operator. - Vector& operator/=(const Type& rhs) throw(); + Vector& operator/=(const Type& rhs); ///Element Access. - Type getElement(uint32_t index) const throw(); + Type getElement(uint32_t index) const; ///Get the x component of the vector. - Type getX(void) const throw(); + Type getX(void) const; ///Get the y component of the vector. - Type getY(void) const throw(); + Type getY(void) const; ///Get the z component of the vector. - Type getZ(void) const throw(); + Type getZ(void) const; ///Get the w component of the vector. - Type getW(void) const throw(); + Type getW(void) const; ///Element Access. - void setElement(uint32_t index, Type tValue) throw(); + void setElement(uint32_t index, Type tValue); ///Element Access. - void setElements(Type x, Type y) throw(); + void setElements(Type x, Type y); ///Element Access. - void setElements(Type x, Type y, Type z) throw(); + void setElements(Type x, Type y, Type z); ///Element Access. - void setElements(Type x, Type y, Type z, Type w) throw(); + void setElements(Type x, Type y, Type z, Type w); ///Set the x component of the vector. - void setX(Type tX) throw(); + void setX(Type tX); ///Set the y component of the vector. - void setY(Type tY) throw(); + void setY(Type tY); ///Set the z component of the vector. - void setZ(Type tZ) throw(); + void setZ(Type tZ); ///Set the w component of the vector. - void setW(Type tW) throw(); + void setW(Type tW); ///Get the length of the vector. - double length(void) const throw(); + double length(void) const; ///Get the squared length of the vector. - double lengthSquared(void) const throw(); + double lengthSquared(void) const; ///Find the angle between this vector and that which is passed as a parameter. - double angleTo(const Vector& vector) const throw(); + double angleTo(const Vector& vector) const; ///Find the cross product between this vector and the vector passed as a parameter. - Vector cross(const Vector& vector) const throw(); + Vector cross(const Vector& vector) const; ///Find the dot product between this vector and the vector passed as a parameter. - Type dot(const Vector& rhs) const throw(); + Type dot(const Vector& rhs) const; ///Normalise the vector. - void normalise(void) throw(); + void normalise(void); private: //Values for the vector @@ -147,25 +147,25 @@ namespace PolyVox //Non-member overloaded operators. ///Addition operator. template - Vector operator+(const Vector& lhs, const Vector& rhs) throw(); + Vector operator+(const Vector& lhs, const Vector& rhs); ///Subtraction operator. template - Vector operator-(const Vector& lhs, const Vector& rhs) throw(); + Vector operator-(const Vector& lhs, const Vector& rhs); ///Multiplication operator. template - Vector operator*(const Vector& lhs, const Vector& rhs) throw(); + Vector operator*(const Vector& lhs, const Vector& rhs); ///Division operator. template - Vector operator/(const Vector& lhs, const Vector& rhs) throw(); + Vector operator/(const Vector& lhs, const Vector& rhs); ///Multiplication operator. template - Vector operator*(const Vector& lhs, const Type& rhs) throw(); + Vector operator*(const Vector& lhs, const Type& rhs); ///Division operator. template - Vector operator/(const Vector& lhs, const Type& rhs) throw(); + Vector operator/(const Vector& lhs, const Type& rhs); ///Stream insertion operator. template - std::ostream& operator<<(std::ostream& os, const Vector& vector) throw(); + std::ostream& operator<<(std::ostream& os, const Vector& vector); //Some handy typedefs ///A 3D Vector of floats. diff --git a/library/PolyVoxCore/include/PolyVoxCore/Vector.inl b/library/PolyVoxCore/include/PolyVoxCore/Vector.inl index f00df4a2..c6a7acd9 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Vector.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/Vector.inl @@ -30,7 +30,7 @@ namespace PolyVox \param y y component to set. */ template - Vector::Vector(Type x, Type y) throw() + Vector::Vector(Type x, Type y) { m_tElements[0] = x; m_tElements[1] = y; @@ -44,7 +44,7 @@ namespace PolyVox \param z z component to set. */ template - Vector::Vector(Type x, Type y, Type z) throw() + Vector::Vector(Type x, Type y, Type z) { m_tElements[0] = x; m_tElements[1] = y; @@ -60,7 +60,7 @@ namespace PolyVox \param w w component to set. */ template - Vector::Vector(Type x, Type y, Type z, Type w) throw() + Vector::Vector(Type x, Type y, Type z, Type w) { m_tElements[0] = x; m_tElements[1] = y; @@ -72,7 +72,7 @@ namespace PolyVox Creates a Vector object but does not initialise it. */ template - Vector::Vector(void) throw() + Vector::Vector(void) { } @@ -81,7 +81,7 @@ namespace PolyVox \param vector A reference to the Vector to be copied. */ template - Vector::Vector(const Vector& vector) throw() + Vector::Vector(const Vector& vector) { std::memcpy(m_tElements, vector.m_tElements, sizeof(Type) * Size); } @@ -97,7 +97,7 @@ namespace PolyVox */ template template - Vector::Vector(const Vector& vector) throw() + Vector::Vector(const Vector& vector) { for(uint32_t ct = 0; ct < Size; ++ct) { @@ -109,7 +109,7 @@ namespace PolyVox Destroys the Vector. */ template - Vector::~Vector(void) throw() + Vector::~Vector(void) { } @@ -119,7 +119,7 @@ namespace PolyVox \return A reference to the result to allow chaining. */ template - Vector& Vector::operator=(const Vector& rhs) throw() + Vector& Vector::operator=(const Vector& rhs) { if(this == &rhs) { @@ -136,7 +136,7 @@ namespace PolyVox \see operator!= */ template - inline bool Vector::operator==(const Vector &rhs) const throw() + inline bool Vector::operator==(const Vector &rhs) const { bool equal = true; for(uint32_t ct = 0; ct < Size; ++ct) @@ -157,7 +157,7 @@ namespace PolyVox \see operator== */ template - inline bool Vector::operator!=(const Vector &rhs) const throw() + inline bool Vector::operator!=(const Vector &rhs) const { return !(*this == rhs); //Just call equality operator and invert the result. } @@ -170,7 +170,7 @@ namespace PolyVox \see operator!= */ template - inline bool Vector::operator<(const Vector &rhs) const throw() + inline bool Vector::operator<(const Vector &rhs) const { for(uint32_t ct = 0; ct < Size; ++ct) { @@ -188,7 +188,7 @@ namespace PolyVox \return The resulting Vector. */ template - inline Vector& Vector::operator+=(const Vector& rhs) throw() + inline Vector& Vector::operator+=(const Vector& rhs) { for(uint32_t ct = 0; ct < Size; ++ct) { @@ -203,7 +203,7 @@ namespace PolyVox \return The resulting Vector. */ template - inline Vector& Vector::operator-=(const Vector& rhs) throw() + inline Vector& Vector::operator-=(const Vector& rhs) { for(uint32_t ct = 0; ct < Size; ++ct) { @@ -218,7 +218,7 @@ namespace PolyVox \return The resulting Vector. */ template - inline Vector& Vector::operator*=(const Vector& rhs) throw() + inline Vector& Vector::operator*=(const Vector& rhs) { for(uint32_t ct = 0; ct < Size; ++ct) { @@ -233,7 +233,7 @@ namespace PolyVox \return The resulting Vector. */ template - inline Vector& Vector::operator/=(const Vector& rhs) throw() + inline Vector& Vector::operator/=(const Vector& rhs) { for(uint32_t ct = 0; ct < Size; ++ct) { @@ -248,7 +248,7 @@ namespace PolyVox \return The resulting Vector. */ template - inline Vector& Vector::operator*=(const Type& rhs) throw() + inline Vector& Vector::operator*=(const Type& rhs) { for(uint32_t ct = 0; ct < Size; ++ct) { @@ -263,7 +263,7 @@ namespace PolyVox \return The resulting Vector. */ template - inline Vector& Vector::operator/=(const Type& rhs) throw() + inline Vector& Vector::operator/=(const Type& rhs) { for(uint32_t ct = 0; ct < Size; ++ct) { @@ -279,7 +279,7 @@ namespace PolyVox \return The resulting Vector. */ template - Vector operator+(const Vector& lhs, const Vector& rhs) throw() + Vector operator+(const Vector& lhs, const Vector& rhs) { Vector result = lhs; result += rhs; @@ -293,7 +293,7 @@ namespace PolyVox \return The resulting Vector. */ template - Vector operator-(const Vector& lhs, const Vector& rhs) throw() + Vector operator-(const Vector& lhs, const Vector& rhs) { Vector result = lhs; result -= rhs; @@ -307,7 +307,7 @@ namespace PolyVox \return The resulting Vector. */ template - Vector operator*(const Vector& lhs, const Vector& rhs) throw() + Vector operator*(const Vector& lhs, const Vector& rhs) { Vector result = lhs; result *= rhs; @@ -321,7 +321,7 @@ namespace PolyVox \return The resulting Vector. */ template - Vector operator/(const Vector& lhs, const Vector& rhs) throw() + Vector operator/(const Vector& lhs, const Vector& rhs) { Vector result = lhs; result /= rhs; @@ -335,7 +335,7 @@ namespace PolyVox \return The resulting Vector. */ template - Vector operator*(const Vector& lhs, const Type& rhs) throw() + Vector operator*(const Vector& lhs, const Type& rhs) { Vector result = lhs; result *= rhs; @@ -349,7 +349,7 @@ namespace PolyVox \return The resulting Vector. */ template - Vector operator/(const Vector& lhs, const Type& rhs) throw() + Vector operator/(const Vector& lhs, const Type& rhs) { Vector result = lhs; result /= rhs; @@ -363,7 +363,7 @@ namespace PolyVox \return A reference to the output stream to allow chaining. */ template - std::ostream& operator<<(std::ostream& os, const Vector& vector) throw() + std::ostream& operator<<(std::ostream& os, const Vector& vector) { os << "("; for(uint32_t ct = 0; ct < Size; ++ct) @@ -384,7 +384,7 @@ namespace PolyVox \return The element. */ template - inline Type Vector::getElement(uint32_t index) const throw() + inline Type Vector::getElement(uint32_t index) const { return m_tElements[index]; } @@ -393,7 +393,7 @@ namespace PolyVox \return A const reference to the X component of a 1, 2, 3, or 4 dimensional Vector. */ template - inline Type Vector::getX(void) const throw() + inline Type Vector::getX(void) const { return m_tElements[0]; } @@ -402,7 +402,7 @@ namespace PolyVox \return A const reference to the Y component of a 2, 3, or 4 dimensional Vector. */ template - inline Type Vector::getY(void) const throw() + inline Type Vector::getY(void) const { return m_tElements[1]; } @@ -411,7 +411,7 @@ namespace PolyVox \return A const reference to the Z component of a 3 or 4 dimensional Vector. */ template - inline Type Vector::getZ(void) const throw() + inline Type Vector::getZ(void) const { return m_tElements[2]; } @@ -420,7 +420,7 @@ namespace PolyVox \return A const reference to the W component of a 4 dimensional Vector. */ template - inline Type Vector::getW(void) const throw() + inline Type Vector::getW(void) const { return m_tElements[3]; } @@ -430,7 +430,7 @@ namespace PolyVox \param tValue The new value for the element. */ template - inline void Vector::setElement(uint32_t index, Type tValue) throw() + inline void Vector::setElement(uint32_t index, Type tValue) { m_tElements[index] = tValue; } @@ -441,7 +441,7 @@ namespace PolyVox \param y y component to set. */ template - inline void Vector::setElements(Type x, Type y) throw() + inline void Vector::setElements(Type x, Type y) { m_tElements[0] = x; m_tElements[1] = y; @@ -455,7 +455,7 @@ namespace PolyVox \param z z component to set. */ template - inline void Vector::setElements(Type x, Type y, Type z) throw() + inline void Vector::setElements(Type x, Type y, Type z) { m_tElements[0] = x; m_tElements[1] = y; @@ -471,7 +471,7 @@ namespace PolyVox \param w w component to set. */ template - inline void Vector::setElements(Type x, Type y, Type z, Type w) throw() + inline void Vector::setElements(Type x, Type y, Type z, Type w) { m_tElements[0] = x; m_tElements[1] = y; @@ -483,7 +483,7 @@ namespace PolyVox \param tX The new value for the X component of a 1, 2, 3, or 4 dimensional Vector. */ template - inline void Vector::setX(Type tX) throw() + inline void Vector::setX(Type tX) { m_tElements[0] = tX; } @@ -492,7 +492,7 @@ namespace PolyVox \param tY The new value for the Y component of a 2, 3, or 4 dimensional Vector. */ template - inline void Vector::setY(Type tY) throw() + inline void Vector::setY(Type tY) { m_tElements[1] = tY; } @@ -501,7 +501,7 @@ namespace PolyVox \param tZ The new value for the Z component of a 3 or 4 dimensional Vector. */ template - inline void Vector::setZ(Type tZ) throw() + inline void Vector::setZ(Type tZ) { m_tElements[2] = tZ; } @@ -510,7 +510,7 @@ namespace PolyVox \param tW The new value for the W component of a 4 dimensional Vector. */ template - inline void Vector::setW(Type tW) throw() + inline void Vector::setW(Type tW) { m_tElements[3] = tW; } @@ -520,7 +520,7 @@ namespace PolyVox \return Length of the Vector. */ template - inline double Vector::length(void) const throw() + inline double Vector::length(void) const { return sqrt(lengthSquared()); } @@ -529,7 +529,7 @@ namespace PolyVox \return Squared length of the Vector. */ template - inline double Vector::lengthSquared(void) const throw() + inline double Vector::lengthSquared(void) const { double result = 0.0f; for(uint32_t ct = 0; ct < Size; ++ct) @@ -549,7 +549,7 @@ namespace PolyVox \return The angle between them in radians. */ template - inline double Vector::angleTo(const Vector& vector) const throw() + inline double Vector::angleTo(const Vector& vector) const { return acos(dot(vector) / (vector.length() * this->length())); } @@ -567,7 +567,7 @@ namespace PolyVox \see dot() */ template - inline Vector Vector::cross(const Vector& vector) const throw() + inline Vector Vector::cross(const Vector& vector) const { Type i = vector.getZ() * this->getY() - vector.getY() * this->getZ(); Type j = vector.getX() * this->getZ() - vector.getZ() * this->getX(); @@ -583,7 +583,7 @@ namespace PolyVox \see cross() */ template - inline Type Vector::dot(const Vector& rhs) const throw() + inline Type Vector::dot(const Vector& rhs) const { Type dotProduct = static_cast(0); for(uint32_t ct = 0; ct < Size; ++ct) @@ -599,7 +599,7 @@ namespace PolyVox \note This function does not make much sense on integer Vectors. */ template - inline void Vector::normalise(void) throw() + inline void Vector::normalise(void) { Type tLength = this->length(); //FIXME - throw div by zero exception? diff --git a/library/PolyVoxCore/source/Region.cpp b/library/PolyVoxCore/source/Region.cpp index 79040009..960976bb 100644 --- a/library/PolyVoxCore/source/Region.cpp +++ b/library/PolyVoxCore/source/Region.cpp @@ -66,7 +66,7 @@ namespace PolyVox \return true if the Regions match. \see operator!= */ - bool Region::operator==(const Region& rhs) const throw() + bool Region::operator==(const Region& rhs) const { return ((m_v3dLowerCorner == rhs.m_v3dLowerCorner) && (m_v3dUpperCorner == rhs.m_v3dUpperCorner)); } @@ -77,7 +77,7 @@ namespace PolyVox \return true if the Regions do not match. \see operator== */ - bool Region::operator!=(const Region& rhs) const throw() + bool Region::operator!=(const Region& rhs) const { return !(*this == rhs); }