rice 4.3.2 → 4.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f1560a877de281b9d1fb0538591d606dc0fe312a6fbbaaf9d15448028836fad
-  data.tar.gz: 0af73222a775ef41799404a26c4cd69290330ce41184b512ecfb1a2d05925900
+  metadata.gz: 20166e7dba31a0e143cdc5a0be57c36a61ae93975ff2aaefbb1682e55382a40d
+  data.tar.gz: dff13c1a5eb9ea2672754cd30ddcd817d7865c497f6869f34dc920cfb3d0f111
 SHA512:
-  metadata.gz: 426d8192d42f45b177a4f8639dc7d329143c2a5874b3ead5ab71bdcf0299d46d0e0d707cb616e57c33f2c2896aba7497baaba3191d02ab846ac2b2b49abe3071
-  data.tar.gz: d3cab1776f0817e76ee2d0576c8addf3412bf16d0da5fbcb64232d5aa9887b7f9c3607878e201cc9677e387ec4253a61add0be845e46bfa6751d261b4d596815
+  metadata.gz: 4afced2db4bb7f4b5eb2520a5a0d297acf74a738ae2932225ecf2be9c10348cb426252c40f0204f651389d5823aae996065278262101685a2f64e65c0e2472e8
+  data.tar.gz: 8c2293c0d4159954e7640c148865b51e8263c02ce7b35c3a18d4b5b56c35c853007b8b88799265ab4f389455006fa179a089888791c6c6d88f79a85d95f448fe

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.3.3
+
+* Fix complication issue on Ubuntu 20.04 and GCC 9.
+
 ## 4.3.2
 
 * Improve NativeRegistry to reduce possible hash collisions and weird "bad any cast" errors.

data/include/rice/rice.hpp

@@ -1075,7 +1075,6 @@ namespace Rice::detail
 
 #include <unordered_map>
 #include <any>
-#include <tuple>
 
 
 namespace Rice::detail
@@ -1094,8 +1093,7 @@ namespace Rice::detail
     Return_T lookup(VALUE klass, ID method_id);
 
   private:
-    size_t key(VALUE klass, ID method_id);
-    std::unordered_multimap<size_t, std::tuple<VALUE, ID, std::any>> natives_ = {};
+    std::unordered_multimap<ID, std::pair<VALUE, std::any>> natives_ = {};
   };
 }
 
@@ -1111,14 +1109,6 @@ namespace Rice::detail
 
 namespace Rice::detail
 {
-  // Effective Java (2nd edition)
-  // https://stackoverflow.com/a/2634715
-  inline size_t NativeRegistry::key(VALUE klass, ID id)
-  {
-    uint32_t prime = 53;
-    return (prime + klass) * prime + id;
-  }
-
   inline void NativeRegistry::add(VALUE klass, ID method_id, std::any callable)
   {
     if (rb_type(klass) == T_ICLASS)
@@ -1126,19 +1116,19 @@ namespace Rice::detail
       klass = detail::protect(rb_class_of, klass);
     }
 
-    auto range = this->natives_.equal_range(key(klass, method_id));
+    auto range = this->natives_.equal_range(method_id);
     for (auto it = range.first; it != range.second; ++it)
     {
-      const auto [k, m, d] = it->second;
+      const auto [k, d] = it->second;
 
-      if (k == klass && m == method_id)
+      if (k == klass)
       {
-        std::get<2>(it->second) = callable;
+        std::get<1>(it->second) = callable;
         return;
       }
     }
 
-    this->natives_.emplace(std::make_pair(key(klass, method_id), std::make_tuple(klass, method_id, callable)));
+    this->natives_.emplace(std::make_pair(method_id, std::make_pair(klass, callable)));
   }
 
   template <typename Return_T>
@@ -1162,12 +1152,12 @@ namespace Rice::detail
       klass = detail::protect(rb_class_of, klass);
     }
 
-    auto range = this->natives_.equal_range(key(klass, method_id));
+    auto range = this->natives_.equal_range(method_id);
     for (auto it = range.first; it != range.second; ++it)
     {
-      const auto [k, m, d] = it->second;
+      const auto [k, d] = it->second;
 
-      if (k == klass && m == method_id)
+      if (k == klass)
       {
         auto* ptr = std::any_cast<Return_T>(&d);
         if (!ptr)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Rice
-  VERSION = "4.3.2"
+  VERSION = "4.3.3"
 end

data/rice/detail/NativeRegistry.hpp

@@ -3,7 +3,6 @@
 
 #include <unordered_map>
 #include <any>
-#include <tuple>
 
 #include "ruby.hpp"
 
@@ -23,8 +22,7 @@ namespace Rice::detail
     Return_T lookup(VALUE klass, ID method_id);
 
   private:
-    size_t key(VALUE klass, ID method_id);
-    std::unordered_multimap<size_t, std::tuple<VALUE, ID, std::any>> natives_ = {};
+    std::unordered_multimap<ID, std::pair<VALUE, std::any>> natives_ = {};
   };
 }
 #include "NativeRegistry.ipp"

data/rice/detail/NativeRegistry.ipp

@@ -10,14 +10,6 @@
 
 namespace Rice::detail
 {
-  // Effective Java (2nd edition)
-  // https://stackoverflow.com/a/2634715
-  inline size_t NativeRegistry::key(VALUE klass, ID id)
-  {
-    uint32_t prime = 53;
-    return (prime + klass) * prime + id;
-  }
-
   inline void NativeRegistry::add(VALUE klass, ID method_id, std::any callable)
   {
     if (rb_type(klass) == T_ICLASS)
@@ -25,19 +17,19 @@ namespace Rice::detail
       klass = detail::protect(rb_class_of, klass);
     }
 
-    auto range = this->natives_.equal_range(key(klass, method_id));
+    auto range = this->natives_.equal_range(method_id);
     for (auto it = range.first; it != range.second; ++it)
     {
-      const auto [k, m, d] = it->second;
+      const auto [k, d] = it->second;
 
-      if (k == klass && m == method_id)
+      if (k == klass)
       {
-        std::get<2>(it->second) = callable;
+        std::get<1>(it->second) = callable;
         return;
       }
     }
 
-    this->natives_.emplace(std::make_pair(key(klass, method_id), std::make_tuple(klass, method_id, callable)));
+    this->natives_.emplace(std::make_pair(method_id, std::make_pair(klass, callable)));
   }
 
   template <typename Return_T>
@@ -61,12 +53,12 @@ namespace Rice::detail
       klass = detail::protect(rb_class_of, klass);
     }
 
-    auto range = this->natives_.equal_range(key(klass, method_id));
+    auto range = this->natives_.equal_range(method_id);
     for (auto it = range.first; it != range.second; ++it)
     {
-      const auto [k, m, d] = it->second;
+      const auto [k, d] = it->second;
 
-      if (k == klass && m == method_id)
+      if (k == klass)
       {
         auto* ptr = std::any_cast<Return_T>(&d);
         if (!ptr)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rice
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.3.3
 platform: ruby
 authors:
 - Paul Brannan
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-18 00:00:00.000000000 Z
+date: 2024-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler