Fix issue #88 and add option to enable or disable unsafe casts

madmann91 · Jul 7, 2024 · 77a08ca · 77a08ca
1 parent 3490634
commit 77a08ca
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.21)
 project(bvh VERSION 2.0)
 
 option(BVH_BUILD_C_API "Builds the C API library wrapper" OFF)
-option(BVH_STATIC_LINK_STDLIB_C_API "Link the C API library statically against the standard C++ library" OFF)
+option(BVH_C_API_STATIC_LINK_STDLIB "Link the C API library statically against the standard C++ library (only supported by clang/gcc)" OFF)
+option(BVH_C_API_UNSAFE_CASTS "Enable unsafe casts in C API" OFF)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

diff --git a/src/bvh/v2/bvh.h b/src/bvh/v2/bvh.h
@@ -8,6 +8,7 @@
 #include <vector>
 #include <stack>
 #include <utility>
+#include <tuple>
 #include <algorithm>
 
 namespace bvh::v2 {

diff --git a/src/bvh/v2/c_api/CMakeLists.txt b/src/bvh/v2/c_api/CMakeLists.txt
@@ -9,9 +9,13 @@ set_target_properties(bvh_c PROPERTIES
     CXX_VISIBILITY_PRESET hidden
     INTERPROCEDURAL_OPTIMIZATION_RELEASE ON)
 
-if (BVH_STATIC_LINK_STDLIB_C_API)
+if (BVH_C_API_STATIC_LINK_STDLIB)
     # Link statically against standard C++ library
     target_link_options(bvh_c PRIVATE $<$<C_COMPILER_ID:GNU,Clang>:-static-libstdc++>)
 endif()
 
+if (BVH_C_API_UNSAFE_CASTS)
+    target_compile_definitions(bvh_c PRIVATE -DBVH_C_API_UNSAFE_CASTS)
+endif()
+
 install(FILES bvh.h DESTINATION include/bvh/v2/c_api/)
diff --git a/src/bvh/v2/c_api/bvh_impl.h b/src/bvh/v2/c_api/bvh_impl.h
@@ -19,7 +19,7 @@ template <> struct BvhCallback<double> { using Type = bvh_intersect_callbackd; }
 template <typename T, size_t Dim>
 static auto translate(enum bvh_build_quality quality) {
     switch (quality) {
-#ifndef BVH_C_UNSAFE_CASTS
+#ifndef BVH_C_API_UNSAFE_CASTS
         case BVH_BUILD_QUALITY_LOW:
             return bvh::v2::DefaultBuilder<bvh::v2::Node<T, Dim>>::Quality::Low;
         case BVH_BUILD_QUALITY_MEDIUM:
@@ -28,7 +28,7 @@ static auto translate(enum bvh_build_quality quality) {
             return bvh::v2::DefaultBuilder<bvh::v2::Node<T, Dim>>::Quality::High;
 #endif
         default:
-            return static_cast<bvh::v2::DefaultBuilder<bvh::v2::Node<T, Dim>>::Quality>(quality);
+            return static_cast<typename bvh::v2::DefaultBuilder<bvh::v2::Node<T, Dim>>::Quality>(quality);
     }
 }
 
@@ -89,7 +89,7 @@ static typename BvhTypes<T, Dim>::Bvh* bvh_build(
 {
     bvh::v2::BBox<T, Dim>* translated_bboxes = nullptr;
     bvh::v2::Vec<T, Dim>* translated_centers = nullptr;
-#ifdef BVH_C_UNSAFE_CASTS
+#ifdef BVH_C_API_UNSAFE_CASTS
     translated_bboxes  = reinterpret_cast<decltype(translated_bboxes)>(bboxes);
     translated_centers = reinterpret_cast<decltype(translated_centers)>(centers);
 #else