allow blind C++ windows RC structures

Author: 9il

include/mir/rcarray.h

@@ -25,8 +25,6 @@ struct mir_rcarray
 
     T* _payload = nullptr;
     using U = typename std::remove_all_extents<T>::type;
-    static constexpr void (*destr)(U&) = std::is_destructible<T>::value ? &mir::Destructor<U>::destroy : nullptr;
-    static constexpr mir::type_info_g<U> typeInfoT = {destr, sizeof(T)};
 
     void _cpp_copy_constructor(const mir_rcarray& rhs) noexcept;
     mir_rcarray& _cpp_assign(const mir_rcarray& rhs) noexcept;
@@ -38,7 +36,7 @@ struct mir_rcarray
     {
         if (length == 0)
             return;
-        auto context = mir_rc_create((const mir_type_info*)&typeInfoT, length, nullptr, false, deallocate);
+        auto context = mir_rc_create(mir::typeInfoT_<U>(), length, nullptr, false, deallocate);
         if (context == nullptr)
             throw std::bad_alloc();
         _payload = (T*)(context + 1);

include/mir/rcptr.h

@@ -72,6 +72,13 @@ namespace mir
 
         // template<class = typename std::enable_if<std::is_destructible<T>::value>::type>
 
+    template<class U>
+    static const mir_type_info* typeInfoT_()
+    {
+        static constexpr void (*destr)(U&) = std::is_destructible<U>::value ? &Destructor<U>::destroy : nullptr;
+        static constexpr type_info_g<U> value = {destr, sizeof(U)};
+        return (const mir_type_info*)&value;
+    }
 }
 
 // Does not support allocators for now
@@ -83,8 +90,6 @@ struct mir_rcptr
     T* _payload = nullptr;
     mir_rc_context* _context = nullptr;
     using U = typename std::remove_all_extents<T>::type;
-    static constexpr void (*destr)(U&) = std::is_destructible<T>::value ? &mir::Destructor<U>::destroy : nullptr;
-    static constexpr mir::type_info_g<U> typeInfoT = {destr, sizeof(T)};
 
 public:
 
@@ -114,7 +119,7 @@ struct mir_rcptr
         using U = typename std::remove_const<T>::type;
         static_assert( std::is_constructible<U, Args...>::value, "Can't construct object in mir_rcptr constructor" );
         mir_rcptr ret;
-        ret._context = mir_rc_create((const mir_type_info*)&typeInfoT, 1);
+        ret._context = mir_rc_create(mir::typeInfoT_<U>(), 1);
         if (ret._context == nullptr)
             throw std::bad_alloc();
         ret._payload = (T*)(ret._context + 1);

include/mir/slim_rcptr.h

@@ -12,8 +12,6 @@ struct mir_slim_rcptr
 
     T* _payload = nullptr;
     using U = typename std::remove_all_extents<T>::type;
-    static constexpr void (*destr)(U&) = std::is_destructible<T>::value ? &mir::Destructor<U>::destroy : nullptr;
-    static constexpr mir::type_info_g<U> typeInfoT = {destr, sizeof(T)};
 
 public:
 
@@ -49,7 +47,7 @@ struct mir_slim_rcptr
         using U = typename std::remove_const<T>::type;
         static_assert( std::is_constructible<U, Args...>::value, "Can't construct object in mir_slim_rcptr constructor" );
         mir_slim_rcptr ret;
-        auto context = mir_rc_create((const mir_type_info*)&typeInfoT, 1);
+        auto context = mir_rc_create(mir::typeInfoT_<U>(), 1);
         if (context == nullptr)
             throw std::bad_alloc();
         ret._payload = (T*)(context + 1);