Merge pull request #284 from ruby-rice/dev

Dev

Author: cfis

FindRuby.cmake

@@ -378,12 +378,7 @@ set(_Ruby_POSSIBLE_LIB_NAMES
 )
 
 if (WIN32 OR MSYS)
-  if (WIN32)
-    set(_Ruby_POSSIBLE_RUNTIMES "vcruntime140;vcruntime140_1;msvcr${MSVC_TOOLSET_VERSION}")
-  else ()
-    set(_Ruby_POSSIBLE_RUNTIMES "ucrt;msvcrt")
-  endif ()
-
+  set(_Ruby_POSSIBLE_RUNTIMES "ucrt;msvcrt;vcruntime140;vcruntime140_1;msvcr${MSVC_TOOLSET_VERSION}")
   set(_Ruby_POSSIBLE_VERSION_SUFFIXES "${_Ruby_VERSION_NODOT};${_Ruby_VERSION_NODOT_ZERO_PATCH}")
   # Under MSYS CMAKE_SIZEOF_VOID_P is unset so add prefixes for 32 and 64 architectures
   set(_Ruby_POSSIBLE_ARCH_PREFIXES "lib;libx64-;x64-")

rice/Data_Type.hpp

@@ -175,9 +175,7 @@ namespace Rice
     // Typed Data support
     static inline rb_data_type_t* rb_data_type_ = nullptr;
 
-    // Track unbound instances (ie, declared variables of type Data_Type<T>
-    // before define_class is called)
-    static inline std::set<Data_Type<T>*>unbound_instances_;
+    static inline std::set<Data_Type<T>*>& unbound_instances();
   };
 
   //! Define a new data class in the namespace given by module.

rice/Data_Type.ipp

@@ -59,12 +59,12 @@ namespace Rice
     // Now register with the type registry
     detail::Registries::instance.types.add<T>(klass_, rb_data_type_);
 
-    auto iter = Data_Type<T>::unbound_instances_.begin();
-    while (iter != Data_Type<T>::unbound_instances_.end())
+    auto instances = unbound_instances();
+    for (auto instance: instances)
     { 
-      (*iter)->set_value(klass);
-      iter = Data_Type<T>::unbound_instances_.erase(iter);
+      instance->set_value(klass);
     }
+    instances.clear();
 
     return Data_Type<T>();
   }
@@ -84,12 +84,22 @@ namespace Rice
     rb_data_type_ = nullptr;
   }
 
+  // Track unbound instances (ie, declared variables of type Data_Type<T>
+  // before define_class is called). We can't simply use a static inline
+  // member because it sometimes crashes clang and gcc (msvc seems fine)
+  template<typename T>
+  inline std::set<Data_Type<T>*>& Data_Type<T>::unbound_instances()
+  {
+    static std::set<Data_Type<T>*> unbound_instances;
+    return unbound_instances;
+  }
+
   template<typename T>
   inline Data_Type<T>::Data_Type() : Class(klass_ == Qnil ? rb_cObject : klass_)
   {
     if (!is_bound())
     {
-      this->unbound_instances_.insert(this);
+      unbound_instances().insert(this);
     }
   }