diff --git a/IlmBase/Imath/ImathMatrix.h b/IlmBase/Imath/ImathMatrix.h index 8e414297..c5d7e244 100644 --- a/IlmBase/Imath/ImathMatrix.h +++ b/IlmBase/Imath/ImathMatrix.h @@ -262,17 +262,13 @@ template class Matrix33 // //------------------------------------------------------------ - const Matrix33 & invert (bool singExc = false) - IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); + const Matrix33 & invert (bool singExc = false); - Matrix33 inverse (bool singExc = false) const - IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); + Matrix33 inverse (bool singExc = false) const; - const Matrix33 & gjInvert (bool singExc = false) - IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); + const Matrix33 & gjInvert (bool singExc = false); - Matrix33 gjInverse (bool singExc = false) const - IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); + Matrix33 gjInverse (bool singExc = false) const; //------------------------------------------------ @@ -636,17 +632,13 @@ template class Matrix44 // //------------------------------------------------------------ - const Matrix44 & invert (bool singExc = false) - IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); + const Matrix44 & invert (bool singExc = false); - Matrix44 inverse (bool singExc = false) const - IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); + Matrix44 inverse (bool singExc = false) const; - const Matrix44 & gjInvert (bool singExc = false) - IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); + const Matrix44 & gjInvert (bool singExc = false); - Matrix44 gjInverse (bool singExc = false) const - IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); + Matrix44 gjInverse (bool singExc = false) const; //------------------------------------------------ @@ -1430,7 +1422,7 @@ Matrix33::transposed () const template const Matrix33 & -Matrix33::gjInvert (bool singExc) IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Matrix33::gjInvert (bool singExc) { *this = gjInverse (singExc); return *this; @@ -1438,7 +1430,7 @@ Matrix33::gjInvert (bool singExc) IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) template Matrix33 -Matrix33::gjInverse (bool singExc) const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Matrix33::gjInverse (bool singExc) const { int i, j, k; Matrix33 s; @@ -1542,7 +1534,7 @@ Matrix33::gjInverse (bool singExc) const IEX_THROW_SPEC (IEX_NAMESPACE::MathE template const Matrix33 & -Matrix33::invert (bool singExc) IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Matrix33::invert (bool singExc) { *this = inverse (singExc); return *this; @@ -1550,7 +1542,7 @@ Matrix33::invert (bool singExc) IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) template Matrix33 -Matrix33::inverse (bool singExc) const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Matrix33::inverse (bool singExc) const { if (x[0][2] != 0 || x[1][2] != 0 || x[2][2] != 1) { @@ -2699,7 +2691,7 @@ Matrix44::transposed () const template const Matrix44 & -Matrix44::gjInvert (bool singExc) IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Matrix44::gjInvert (bool singExc) { *this = gjInverse (singExc); return *this; @@ -2707,7 +2699,7 @@ Matrix44::gjInvert (bool singExc) IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) template Matrix44 -Matrix44::gjInverse (bool singExc) const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Matrix44::gjInverse (bool singExc) const { int i, j, k; Matrix44 s; @@ -2811,7 +2803,7 @@ Matrix44::gjInverse (bool singExc) const IEX_THROW_SPEC (IEX_NAMESPACE::MathE template const Matrix44 & -Matrix44::invert (bool singExc) IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Matrix44::invert (bool singExc) { *this = inverse (singExc); return *this; @@ -2819,7 +2811,7 @@ Matrix44::invert (bool singExc) IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) template Matrix44 -Matrix44::inverse (bool singExc) const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Matrix44::inverse (bool singExc) const { if (x[0][3] != 0 || x[1][3] != 0 || x[2][3] != 0 || x[3][3] != 1) return gjInverse(singExc); diff --git a/IlmBase/Imath/ImathVec.cpp b/IlmBase/Imath/ImathVec.cpp index b483b07f..37edc970 100644 --- a/IlmBase/Imath/ImathVec.cpp +++ b/IlmBase/Imath/ImathVec.cpp @@ -149,7 +149,7 @@ Vec2::normalize () template <> IMATH_EXPORT const Vec2 & -Vec2::normalizeExc () IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Vec2::normalizeExc () { if ((x == 0) && (y == 0)) throw NullVecExc ("Cannot normalize null vector."); @@ -180,7 +180,7 @@ Vec2::normalized () const template <> IMATH_EXPORT Vec2 -Vec2::normalizedExc () const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Vec2::normalizedExc () const { if ((x == 0) && (y == 0)) throw NullVecExc ("Cannot normalize null vector."); @@ -225,7 +225,7 @@ Vec2::normalize () template <> IMATH_EXPORT const Vec2 & -Vec2::normalizeExc () IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Vec2::normalizeExc () { if ((x == 0) && (y == 0)) throw NullVecExc ("Cannot normalize null vector."); @@ -256,7 +256,7 @@ Vec2::normalized () const template <> IMATH_EXPORT Vec2 -Vec2::normalizedExc () const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Vec2::normalizedExc () const { if ((x == 0) && (y == 0)) throw NullVecExc ("Cannot normalize null vector."); @@ -301,7 +301,7 @@ Vec3::normalize () template <> IMATH_EXPORT const Vec3 & -Vec3::normalizeExc () IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Vec3::normalizeExc () { if ((x == 0) && (y == 0) && (z == 0)) throw NullVecExc ("Cannot normalize null vector."); @@ -332,7 +332,7 @@ Vec3::normalized () const template <> IMATH_EXPORT Vec3 -Vec3::normalizedExc () const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Vec3::normalizedExc () const { if ((x == 0) && (y == 0) && (z == 0)) throw NullVecExc ("Cannot normalize null vector."); @@ -377,7 +377,7 @@ Vec3::normalize () template <> IMATH_EXPORT const Vec3 & -Vec3::normalizeExc () IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Vec3::normalizeExc () { if ((x == 0) && (y == 0) && (z == 0)) throw NullVecExc ("Cannot normalize null vector."); @@ -408,7 +408,7 @@ Vec3::normalized () const template <> IMATH_EXPORT Vec3 -Vec3::normalizedExc () const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Vec3::normalizedExc () const { if ((x == 0) && (y == 0) && (z == 0)) throw NullVecExc ("Cannot normalize null vector."); @@ -453,7 +453,7 @@ Vec4::normalize () template <> IMATH_EXPORT const Vec4 & -Vec4::normalizeExc () IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Vec4::normalizeExc () { if ((x == 0) && (y == 0) && (z == 0) && (w == 0)) throw NullVecExc ("Cannot normalize null vector."); @@ -484,7 +484,7 @@ Vec4::normalized () const template <> IMATH_EXPORT Vec4 -Vec4::normalizedExc () const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Vec4::normalizedExc () const { if ((x == 0) && (y == 0) && (z == 0) && (w == 0)) throw NullVecExc ("Cannot normalize null vector."); @@ -529,7 +529,7 @@ Vec4::normalize () template <> IMATH_EXPORT const Vec4 & -Vec4::normalizeExc () IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Vec4::normalizeExc () { if ((x == 0) && (y == 0) && (z == 0) && (w == 0)) throw NullVecExc ("Cannot normalize null vector."); @@ -560,7 +560,7 @@ Vec4::normalized () const template <> IMATH_EXPORT Vec4 -Vec4::normalizedExc () const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Vec4::normalizedExc () const { if ((x == 0) && (y == 0) && (z == 0) && (w == 0)) throw NullVecExc ("Cannot normalize null vector."); diff --git a/IlmBase/Imath/ImathVec.h b/IlmBase/Imath/ImathVec.h index 7a3102df..6f4e82a3 100644 --- a/IlmBase/Imath/ImathVec.h +++ b/IlmBase/Imath/ImathVec.h @@ -225,11 +225,11 @@ template class Vec2 T length2 () const; const Vec2 & normalize (); // modifies *this - const Vec2 & normalizeExc () IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); + const Vec2 & normalizeExc (); const Vec2 & normalizeNonNull (); Vec2 normalized () const; // does not modify *this - Vec2 normalizedExc () const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); + Vec2 normalizedExc () const; Vec2 normalizedNonNull () const; @@ -437,11 +437,11 @@ template class Vec3 T length2 () const; const Vec3 & normalize (); // modifies *this - const Vec3 & normalizeExc () IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); + const Vec3 & normalizeExc (); const Vec3 & normalizeNonNull (); Vec3 normalized () const; // does not modify *this - Vec3 normalizedExc () const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); + Vec3 normalizedExc () const; Vec3 normalizedNonNull () const; @@ -619,11 +619,11 @@ template class Vec4 T length2 () const; const Vec4 & normalize (); // modifies *this - const Vec4 & normalizeExc () IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); + const Vec4 & normalizeExc (); const Vec4 & normalizeNonNull (); Vec4 normalized () const; // does not modify *this - Vec4 normalizedExc () const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); + Vec4 normalizedExc () const; Vec4 normalizedNonNull () const; @@ -711,7 +711,7 @@ template <> const Vec2 & Vec2::normalize (); template <> const Vec2 & -Vec2::normalizeExc () IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); +Vec2::normalizeExc (); template <> const Vec2 & Vec2::normalizeNonNull (); @@ -720,7 +720,7 @@ template <> Vec2 Vec2::normalized () const; template <> Vec2 -Vec2::normalizedExc () const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); +Vec2::normalizedExc () const; template <> Vec2 Vec2::normalizedNonNull () const; @@ -735,7 +735,7 @@ template <> const Vec2 & Vec2::normalize (); template <> const Vec2 & -Vec2::normalizeExc () IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); +Vec2::normalizeExc (); template <> const Vec2 & Vec2::normalizeNonNull (); @@ -744,7 +744,7 @@ template <> Vec2 Vec2::normalized () const; template <> Vec2 -Vec2::normalizedExc () const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); +Vec2::normalizedExc () const; template <> Vec2 Vec2::normalizedNonNull () const; @@ -759,7 +759,7 @@ template <> const Vec3 & Vec3::normalize (); template <> const Vec3 & -Vec3::normalizeExc () IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); +Vec3::normalizeExc (); template <> const Vec3 & Vec3::normalizeNonNull (); @@ -768,7 +768,7 @@ template <> Vec3 Vec3::normalized () const; template <> Vec3 -Vec3::normalizedExc () const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); +Vec3::normalizedExc () const; template <> Vec3 Vec3::normalizedNonNull () const; @@ -783,7 +783,7 @@ template <> const Vec3 & Vec3::normalize (); template <> const Vec3 & -Vec3::normalizeExc () IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); +Vec3::normalizeExc (); template <> const Vec3 & Vec3::normalizeNonNull (); @@ -792,7 +792,7 @@ template <> Vec3 Vec3::normalized () const; template <> Vec3 -Vec3::normalizedExc () const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); +Vec3::normalizedExc () const; template <> Vec3 Vec3::normalizedNonNull () const; @@ -806,7 +806,7 @@ template <> const Vec4 & Vec4::normalize (); template <> const Vec4 & -Vec4::normalizeExc () IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); +Vec4::normalizeExc (); template <> const Vec4 & Vec4::normalizeNonNull (); @@ -815,7 +815,7 @@ template <> Vec4 Vec4::normalized () const; template <> Vec4 -Vec4::normalizedExc () const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); +Vec4::normalizedExc () const; template <> Vec4 Vec4::normalizedNonNull () const; @@ -830,7 +830,7 @@ template <> const Vec4 & Vec4::normalize (); template <> const Vec4 & -Vec4::normalizeExc () IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); +Vec4::normalizeExc (); template <> const Vec4 & Vec4::normalizeNonNull (); @@ -839,7 +839,7 @@ template <> Vec4 Vec4::normalized () const; template <> Vec4 -Vec4::normalizedExc () const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc); +Vec4::normalizedExc () const; template <> Vec4 Vec4::normalizedNonNull () const; @@ -1209,7 +1209,7 @@ Vec2::normalize () template const Vec2 & -Vec2::normalizeExc () IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Vec2::normalizeExc () { T l = length(); @@ -1246,7 +1246,7 @@ Vec2::normalized () const template Vec2 -Vec2::normalizedExc () const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Vec2::normalizedExc () const { T l = length(); @@ -1701,7 +1701,7 @@ Vec3::normalize () template const Vec3 & -Vec3::normalizeExc () IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Vec3::normalizeExc () { T l = length(); @@ -1740,7 +1740,7 @@ Vec3::normalized () const template Vec3 -Vec3::normalizedExc () const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Vec3::normalizedExc () const { T l = length(); @@ -2106,7 +2106,7 @@ Vec4::normalize () template const Vec4 & -Vec4::normalizeExc () IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Vec4::normalizeExc () { T l = length(); @@ -2147,7 +2147,7 @@ Vec4::normalized () const template Vec4 -Vec4::normalizedExc () const IEX_THROW_SPEC (IEX_NAMESPACE::MathExc) +Vec4::normalizedExc () const { T l = length();