Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use std::variant::emplace when loading #699

Merged
merged 1 commit into from
Sep 17, 2021
Merged

Use std::variant::emplace when loading #699

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions include/cereal/types/variant.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,25 +54,24 @@ namespace cereal
};

//! @internal
template<int N, class Variant, class ... Args, class Archive>
template<int N, class Variant, class Archive>
typename std::enable_if<N == std::variant_size_v<Variant>, void>::type
load_variant(Archive & /*ar*/, int /*target*/, Variant & /*variant*/)
{
throw ::cereal::Exception("Error traversing variant during load");
}
//! @internal
template<int N, class Variant, class H, class ... T, class Archive>
template<int N, class Variant, class Archive>
typename std::enable_if<N < std::variant_size_v<Variant>, void>::type
load_variant(Archive & ar, int target, Variant & variant)
{
if(N == target)
{
H value;
ar( CEREAL_NVP_("data", value) );
variant = std::move(value);
variant.template emplace<N>();
ar( CEREAL_NVP_("data", std::get<N>(variant)) );
}
else
load_variant<N+1, Variant, T...>(ar, target, variant);
load_variant<N+1>(ar, target, variant);
}

} // namespace variant_detail
Expand All @@ -98,7 +97,7 @@ namespace cereal
if(index >= static_cast<std::int32_t>(std::variant_size_v<variant_t>))
throw Exception("Invalid 'index' selector when deserializing std::variant");

variant_detail::load_variant<0, variant_t, VariantTypes...>(ar, index, variant);
variant_detail::load_variant<0>(ar, index, variant);
}

//! Serializing a std::monostate
Expand Down