From d46163a0cd5a9e7d868238afccaf045548675904 Mon Sep 17 00:00:00 2001 From: Ingo Wald Date: Sat, 9 Nov 2024 14:12:15 -0700 Subject: [PATCH] fixed some ambiguous type declarations on systems where float4x4 and float3x3 are already defined in global namespace --- src/anari/include/anari/anari_cpp/ext/linalg.h | 4 ++-- src/helium/BaseGlobalDeviceState.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/anari/include/anari/anari_cpp/ext/linalg.h b/src/anari/include/anari/anari_cpp/ext/linalg.h index 12f26215..27aa3f2f 100644 --- a/src/anari/include/anari/anari_cpp/ext/linalg.h +++ b/src/anari/include/anari/anari_cpp/ext/linalg.h @@ -727,8 +727,8 @@ namespace math { using namespace linalg::aliases; using namespace linalg; -using mat3 = float3x3; -using mat4 = float4x4; + using mat3 = anari::math::float3x3; + using mat4 = anari::math::float4x4; } // namespace math } // namespace anari diff --git a/src/helium/BaseGlobalDeviceState.h b/src/helium/BaseGlobalDeviceState.h index 77ea8f92..23468d8a 100644 --- a/src/helium/BaseGlobalDeviceState.h +++ b/src/helium/BaseGlobalDeviceState.h @@ -16,7 +16,7 @@ namespace helium { using namespace linalg::aliases; -using mat4 = float4x4; + using mat4 = anari::math::float4x4; struct BaseGlobalDeviceState {