@@ -486,7 +486,7 @@ struct ModifiedResult
486486 std::shared_ptr<U>,
487487 U>;
488488
489- using future_type = typename std::conditional_t <std::is_base_of_v<Object, Type >,
489+ using future_type = typename std::conditional_t <std::is_base_of_v<Object, U >,
490490 FieldResult<std::shared_ptr<Object>>,
491491 FieldResult<type>>&&;
492492 };
@@ -542,7 +542,7 @@ struct ModifiedResult
542542
543543 promise.set_value (std::move (wrappedResult));
544544
545- return convert<Other...>(promise.get_future (), std::move (wrappedParams)).get ();
545+ return ModifiedResult:: convert<Other...>(promise.get_future (), std::move (wrappedParams)).get ();
546546 }, std::move (result), std::move (params));
547547 }
548548
@@ -572,7 +572,7 @@ struct ModifiedResult
572572
573573 promise.set_value (std::move (*wrappedResult));
574574
575- return convert<Other...>(promise.get_future (), std::move (wrappedParams)).get ();
575+ return ModifiedResult:: convert<Other...>(promise.get_future (), std::move (wrappedParams)).get ();
576576 }, std::move (result), std::move (params));
577577 }
578578
@@ -595,15 +595,15 @@ struct ModifiedResult
595595 // i.e. std::vector<bool> on many platforms. Copy the values from the std::vector<> rather than moving them.
596596 for (auto entry : wrappedResult)
597597 {
598- children.push (convert<Other...>(entry, ResolverParams (wrappedParams)));
598+ children.push (ModifiedResult:: convert<Other...>(entry, ResolverParams (wrappedParams)));
599599 ++std::get<size_t >(wrappedParams.errorPath .back ());
600600 }
601601 }
602602 else
603603 {
604604 for (auto & entry : wrappedResult)
605605 {
606- children.push (convert<Other...>(std::move (entry), ResolverParams (wrappedParams)));
606+ children.push (ModifiedResult:: convert<Other...>(std::move (entry), ResolverParams (wrappedParams)));
607607 ++std::get<size_t >(wrappedParams.errorPath .back ());
608608 }
609609 }
0 commit comments