Skip to content

Commit

Permalink
Remove duplicate IMATH_HOSTDEVICE (#314)
Browse files Browse the repository at this point in the history
Somehow, a couple methods got duplicate IMATH_HOSTDEVICE attributes,
presumably a benign typo.

Signed-off-by: Cary Phillips <[email protected]>
  • Loading branch information
cary-ilm committed May 21, 2023
1 parent ae99a1f commit bc8abba
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions src/Imath/ImathMatrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -1153,7 +1153,7 @@ typedef Matrix44<double> M44d;
//---------------------------

template <class T>
IMATH_HOSTDEVICE IMATH_HOSTDEVICE inline T*
IMATH_HOSTDEVICE inline T*
Matrix22<T>::operator[] (int i) IMATH_NOEXCEPT
{
return x[i];
Expand Down Expand Up @@ -1251,8 +1251,8 @@ Matrix22<T>::operator= (T a) IMATH_NOEXCEPT
}

template <class T>
IMATH_HOSTDEVICE IMATH_HOSTDEVICE inline T*
Matrix22<T>::getValue() IMATH_NOEXCEPT
IMATH_HOSTDEVICE inline T*
Matrix22<T>::getValue () IMATH_NOEXCEPT
{
return (T*) &x[0][0];
}
Expand Down Expand Up @@ -1738,7 +1738,7 @@ Matrix22<T>::scale (const Vec2<S>& s) IMATH_NOEXCEPT
//---------------------------

template <class T>
IMATH_HOSTDEVICE IMATH_HOSTDEVICE inline T*
IMATH_HOSTDEVICE inline T*
Matrix33<T>::operator[] (int i) IMATH_NOEXCEPT
{
return x[i];
Expand Down Expand Up @@ -1880,8 +1880,8 @@ Matrix33<T>::operator= (T a) IMATH_NOEXCEPT
}

template <class T>
IMATH_HOSTDEVICE IMATH_HOSTDEVICE inline T*
Matrix33<T>::getValue() IMATH_NOEXCEPT
IMATH_HOSTDEVICE inline T*
Matrix33<T>::getValue () IMATH_NOEXCEPT
{
return (T*) &x[0][0];
}
Expand Down Expand Up @@ -2648,8 +2648,8 @@ Matrix33<T>::inverse (bool singExc) const
}

template <class T>
IMATH_HOSTDEVICE IMATH_HOSTDEVICE IMATH_CONSTEXPR14 inline Matrix33<T>
Matrix33<T>::inverse() const IMATH_NOEXCEPT
IMATH_HOSTDEVICE IMATH_CONSTEXPR14 inline Matrix33<T>
Matrix33<T>::inverse () const IMATH_NOEXCEPT
{
if (x[0][2] != 0 || x[1][2] != 0 || x[2][2] != 1)
{
Expand Down Expand Up @@ -3004,7 +3004,7 @@ Matrix33<T>::shear (const Vec2<S>& h) IMATH_NOEXCEPT
//---------------------------

template <class T>
IMATH_HOSTDEVICE IMATH_HOSTDEVICE inline T*
IMATH_HOSTDEVICE inline T*
Matrix44<T>::operator[] (int i) IMATH_NOEXCEPT
{
return x[i];
Expand Down Expand Up @@ -3208,8 +3208,8 @@ Matrix44<T>::operator= (T a) IMATH_NOEXCEPT
}

template <class T>
IMATH_HOSTDEVICE IMATH_HOSTDEVICE inline T*
Matrix44<T>::getValue() IMATH_NOEXCEPT
IMATH_HOSTDEVICE inline T*
Matrix44<T>::getValue () IMATH_NOEXCEPT
{
return (T*) &x[0][0];
}
Expand Down

0 comments on commit bc8abba

Please sign in to comment.