Properly use multimap for lookup in poly casting

relates USCiLab#356, still need final testing on MSVC
headupinclouds · Feb 12, 2017 · 2590f21 · 2590f21
1 parent a917374
commit 2590f21
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/include/cereal/details/polymorphic_impl.hpp b/include/cereal/details/polymorphic_impl.hpp
@@ -307,7 +307,12 @@ namespace cereal
 
                     // Check to see if we have a previous uncommitted path in unregisteredRelations
                     // that is shorter. If so, ignore this path
-                    auto hint = unregisteredRelations.find( parent );
+                    auto hintRange = unregisteredRelations.equal_range( parent );
+                    auto hint = hintRange.first;
+                    for( ; hint != hintRange.second; ++hint )
+                      if( hint->second.first == finalChild )
+                        break;
+
                     const bool uncommittedExists = hint != unregisteredRelations.end();
                     if( uncommittedExists && (hint->second.second.size() <= newLength) )
                       continue;