Merge branch 'fix-cast-arm64' of https://github.com/hearga/VulkanSceneGraph into hearga-fix-cast-arm64

Author: robertosfield

CMakeLists.txt

@@ -98,6 +98,8 @@ if (VSG_SUPPORTS_Windowing)
     endif()
 endif()
 
+set(VSG_USE_DYNAMIC_CAST 0 CACHE STRING "Use dynamic_cast in vsg::Object::cast<T>(), 0 for off, 1 for enabled." )
+
 # this line needs to be after the call to setup_build_vars()
 configure_file("${VSG_SOURCE_DIR}/src/vsg/core/Version.h.in" "${VSG_VERSION_HEADER}")
 

include/vsg/core/Array.h

@@ -32,7 +32,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 namespace vsg
 {
     template<typename T>
-    class Array : public Data
+    class VSG_DECLSPEC Array : public Data
     {
     public:
         using value_type = T;

include/vsg/core/Array2D.h

@@ -30,7 +30,7 @@ namespace vsg
 {
 
     template<typename T>
-    class Array2D : public Data
+    class VSG_DECLSPEC Array2D : public Data
     {
     public:
         using value_type = T;

include/vsg/core/Array3D.h

@@ -30,7 +30,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 namespace vsg
 {
     template<typename T>
-    class Array3D : public Data
+    class VSG_DECLSPEC Array3D : public Data
     {
     public:
         using value_type = T;

include/vsg/core/Export.h

@@ -25,5 +25,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #        define VSG_DECLSPEC
 #    endif
 #else
-#    define VSG_DECLSPEC
+#    if defined(VSG_SHARED_LIBRARY) || defined(VSG_EXPORTS)
+#        define VSG_DECLSPEC __attribute__((visibility("default")))
+#    else
+#        define VSG_DECLSPEC
+#    endif
 #endif

include/vsg/core/Object.h

@@ -85,11 +85,19 @@ namespace vsg
         virtual const std::type_info& type_info() const noexcept { return typeid(Object); }
         virtual bool is_compatible(const std::type_info& type) const noexcept { return typeid(Object) == type; }
 
-        template<class T>
-        T* cast() { return is_compatible(typeid(T)) ? static_cast<T*>(this) : nullptr; }
-
-        template<class T>
-        const T* cast() const { return is_compatible(typeid(T)) ? static_cast<const T*>(this) : nullptr; }
+        #if VSG_USE_DYNAMIC_CAST == 1
+            template<class T>
+            T* cast() { return dynamic_cast<T*>(this); }
+
+            template<class T>
+            const T* cast() const { return dynamic_cast<const T*>(this); }
+        #else
+            template<class T>
+            T* cast() { return is_compatible(typeid(T)) ? static_cast<T*>(this) : nullptr; }
+
+            template<class T>
+            const T* cast() const { return is_compatible(typeid(T)) ? static_cast<const T*>(this) : nullptr; }
+        #endif
 
         /// clone this object using CopyOp's duplicates map to decide whether to clone or to return the original object.
         /// The default clone(CopyOp&) implementation simply returns ref_ptr<> to this object rather attempt to clone.

include/vsg/core/Value.h

@@ -36,7 +36,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 namespace vsg
 {
     template<typename T>
-    class Value : public Data
+    class VSG_DECLSPEC Value : public Data
     {
     public:
         using value_type = T;

src/vsg/CMakeLists.txt

@@ -427,6 +427,10 @@ target_link_libraries(vsg ${LIBRARIES})
 
 if (BUILD_SHARED_LIBS)
     target_compile_definitions(vsg INTERFACE VSG_SHARED_LIBRARY)
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT VSG_USE_DYNAMIC_CAST)
+    # Static build, Clang, and we are not using dynamic_cast:
+    # export Array/Value/etc. to stabilize typeid.
+    target_compile_definitions(vsg PRIVATE VSG_EXPORTS)
 endif()
 
 # install headers

src/vsg/core/Version.h.in

@@ -45,6 +45,9 @@ extern "C"
     /// Native Windowing support provided with vsg::Window::create(windowTraits) enabled when 1, disabled when 0
     #cmakedefine01 VSG_SUPPORTS_Windowing
 
+    /// Define VSG_USE_DYNAMIC_CAST to avoid typeid(T) comparisons in vsg::Object::cast<T>()
+    #define VSG_USE_DYNAMIC_CAST @VSG_USE_DYNAMIC_CAST@
+
     struct VsgVersion
     {
         unsigned int major;