Skip to content

Commit

Permalink
Replace stray Imath:: with IMATH_INTERNAL_NAMESPACE:: (AcademySoftwar…
Browse files Browse the repository at this point in the history
…eFoundation#194)

Signed-off-by: Cary Phillips <[email protected]>
  • Loading branch information
cary-ilm committed Aug 30, 2021
1 parent 811f6ea commit 5fbe59d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/Imath/ImathMatrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -2160,7 +2160,7 @@ Matrix33<T>::operator*= (const Matrix33<T>& v) IMATH_NOEXCEPT
{
// Avoid initializing with 0 values before immediately overwriting them,
// and unroll all loops for the best autovectorization.
Matrix33 tmp(Imath::UNINITIALIZED);
Matrix33 tmp(IMATH_INTERNAL_NAMESPACE::UNINITIALIZED);

tmp.x[0][0] = x[0][0] * v.x[0][0] + x[0][1] * v.x[1][0] + x[0][2] * v.x[2][0];
tmp.x[0][1] = x[0][0] * v.x[0][1] + x[0][1] * v.x[1][1] + x[0][2] * v.x[2][1];
Expand All @@ -2184,7 +2184,7 @@ Matrix33<T>::operator* (const Matrix33<T>& v) const IMATH_NOEXCEPT
{
// Avoid initializing with 0 values before immediately overwriting them,
// and unroll all loops for the best autovectorization.
Matrix33 tmp(Imath::UNINITIALIZED);
Matrix33 tmp(IMATH_INTERNAL_NAMESPACE::UNINITIALIZED);

tmp.x[0][0] = x[0][0] * v.x[0][0] + x[0][1] * v.x[1][0] + x[0][2] * v.x[2][0];
tmp.x[0][1] = x[0][0] * v.x[0][1] + x[0][1] * v.x[1][1] + x[0][2] * v.x[2][1];
Expand Down
2 changes: 1 addition & 1 deletion src/Imath/ImathTypeTraits.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ IMATH_INTERNAL_NAMESPACE_HEADER_ENTER

/// An enable_if helper to be used in template parameters which results in
/// much shorter symbols.
#define IMATH_ENABLE_IF(...) Imath::enable_if_t<(__VA_ARGS__), int> = 0
#define IMATH_ENABLE_IF(...) IMATH_INTERNAL_NAMESPACE::enable_if_t<(__VA_ARGS__), int> = 0


#if IMATH_FOREIGN_VECTOR_INTEROP
Expand Down

0 comments on commit 5fbe59d

Please sign in to comment.