rkcommon : fix test, use fully-qualified rkcommon::math::rsqrt to avoid overload ambiguity

Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Yogesh Tyagi 2025-08-12 11:17:43 +08:00 committed by Anuj Mittal
parent 6a9e47a638
commit 163ab5f04b
No known key found for this signature in database
GPG Key ID: B749E1556041E1B2
2 changed files with 50 additions and 0 deletions

View File

@ -0,0 +1,49 @@
From f0885d7d97e98ad586bbacf5edf7fa4022b425b9 Mon Sep 17 00:00:00 2001
From: Yogesh Tyagi <yogesh.tyagi@intel.com>
Date: Mon, 11 Aug 2025 14:00:50 +0800
Subject: [PATCH] use fully-qualified rkcommon::math::rsqrt to avoid overload
ambiguity
Explicitly calling rkcommon::math::rsqrt() prevents conflict with the
standard rsqrt(double) declared in bits/mathcalls.h, fixing the build
error in Quaternion tests.
Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
Upstream-Status: Submitted [https://github.com/RenderKit/rkcommon/pull/16]
---
tests/math/test_Quaternion.cpp | 2 +-
tests/math/test_rkmath.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/math/test_Quaternion.cpp b/tests/math/test_Quaternion.cpp
index 760d815..f527824 100644
--- a/tests/math/test_Quaternion.cpp
+++ b/tests/math/test_Quaternion.cpp
@@ -187,7 +187,7 @@ template <typename T>
inline void test_slerp()
{
typename T::Scalar two = 2;
- REQUIRE(CmpT(slerp(.5f, T(1, 0, 0, 0), T(0, 1, 0, 0)), T(rsqrt(two), rsqrt(two), 0, 0)));
+ REQUIRE(CmpT(slerp(.5f, T(1, 0, 0, 0), T(0, 1, 0, 0)), T(rkcommon::math::rsqrt(two), rkcommon::math::rsqrt(two), 0, 0)));
}
TEST_CASE("Quaternion functions", "[quat]")
diff --git a/tests/math/test_rkmath.cpp b/tests/math/test_rkmath.cpp
index 7f66532..fd18df4 100644
--- a/tests/math/test_rkmath.cpp
+++ b/tests/math/test_rkmath.cpp
@@ -49,8 +49,8 @@ TEST_CASE("rkmath rcp_safe function", "[rkmath]")
template <typename T>
inline void test_rsqrt()
{
- REQUIRE(CmpT<T>(rsqrt(T(1)), T(1)));
- REQUIRE(CmpT<T>(rsqrt(T(4)), T(.5)));
+ REQUIRE(CmpT<T>(rkcommon::math::rsqrt(T(1)), T(1)));
+ REQUIRE(CmpT<T>(rkcommon::math::rsqrt(T(4)), T(.5)));
}
TEST_CASE("rkmath rsqrt function", "[rkmath]")
--
2.37.3

View File

@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
inherit pkgconfig cmake inherit pkgconfig cmake
SRC_URI = "git://github.com/ospray/rkcommon.git;protocol=https;branch=master \ SRC_URI = "git://github.com/ospray/rkcommon.git;protocol=https;branch=master \
file://0001-use-fully-qualified-rkcommon-math-rsqrt-to-avoid-ove.patch \
" "
SRCREV = "4a00047ae5a3ac705b6b33b4a7574588d91e7953" SRCREV = "4a00047ae5a3ac705b6b33b4a7574588d91e7953"