Apply VSG_DECLSPEC to Array2D, Array3D, and Value;

move VSG_USE_DYNAMIC_CAST to version.h.in

Author: hearga

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

@@ -101,7 +101,7 @@ namespace vsg
             _data(nullptr),
             _size(0)
         {
-            assign(data, offset, stride, static_cast<uint32_t>(l.size()));
+            assign(data, offset, stride, l.size());
 
             iterator itr = begin();
             for (const value_type& v : l) { (*itr++) = v; }

include/vsg/core/Array2D.h

@@ -31,7 +31,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/Object.h

@@ -22,12 +22,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #include <vsg/core/ref_ptr.h>
 #include <vsg/core/type_name.h>
 
-#ifdef VSG_USE_DYNAMIC_CAST
-    #define VSG_CAST_DYNAMIC
-#else
-    #undef VSG_CAST_DYNAMIC
-#endif
-
 namespace vsg
 {
 
@@ -91,7 +85,7 @@ 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; }
 
-        #ifdef VSG_CAST_DYNAMIC  
+        #if VSG_USE_DYNAMIC_CAST == 1
             template<class T>
             T* cast() { return dynamic_cast<T*>(this); }
 

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

@@ -426,14 +426,10 @@ target_link_libraries(vsg ${LIBRARIES})
 
 if (BUILD_SHARED_LIBS)
     target_compile_definitions(vsg INTERFACE VSG_SHARED_LIBRARY)
-else()
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        if (VSG_USE_DYNAMIC_CAST)
-            target_compile_definitions(vsg PRIVATE VSG_USE_DYNAMIC_CAST)
-        else ()
-            target_compile_definitions(vsg PRIVATE VSG_EXPORTS)
-        endif ()
-    endif()
+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
     #define VSG_SUPPORTS_Windowing @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;