mirror of
https://github.com/robbert-vdh/yabridge.git
synced 2026-05-10 04:30:12 +02:00
Make the in place std::variant<> extension smarter
With the suggestions to use `std::get_if<>` and to only do this for nontrivial types from https://github.com/fraillt/bitsery/issues/76#issuecomment-850371533.
This commit is contained in:
@@ -40,24 +40,28 @@ class InPlaceVariant : public StdVariant<Overloads...> {
|
|||||||
des.adapter(), index, sizeof...(Ts),
|
des.adapter(), index, sizeof...(Ts),
|
||||||
std::integral_constant<bool, Des::TConfig::CheckDataErrors>{});
|
std::integral_constant<bool, Des::TConfig::CheckDataErrors>{});
|
||||||
|
|
||||||
|
// Most of this is copied directly from the original implementation.
|
||||||
|
// We just added the check here to reuse the existing object if
|
||||||
|
// possible.
|
||||||
this->execIndex(index, obj, [this, &des](auto& data, auto index) {
|
this->execIndex(index, obj, [this, &des](auto& data, auto index) {
|
||||||
constexpr size_t Index = decltype(index)::value;
|
constexpr size_t Index = decltype(index)::value;
|
||||||
using TElem =
|
using TElem =
|
||||||
typename std::variant_alternative<Index,
|
typename std::variant_alternative<Index,
|
||||||
std::variant<Ts...>>::type;
|
std::variant<Ts...>>::type;
|
||||||
|
// Reinitializing nontrivial types may be expensive especially when
|
||||||
|
// they reference heap data, so if `data` is already holding the
|
||||||
|
// requested variant then we'll deserialize into the existing object
|
||||||
|
if constexpr (std::is_trivial_v<TElem>) {
|
||||||
|
if (auto item = std::get_if<TElem>(&data)) {
|
||||||
|
this->serializeType(des, *item);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Most of this is copied directly from the original implementation.
|
|
||||||
// We just added the check here to reuse the existing object if
|
|
||||||
// possible.
|
|
||||||
if (std::holds_alternative<TElem>(data)) {
|
|
||||||
TElem& item = std::get<TElem>(data);
|
|
||||||
this->serializeType(des, item);
|
|
||||||
} else {
|
|
||||||
TElem item = ::bitsery::Access::create<TElem>();
|
TElem item = ::bitsery::Access::create<TElem>();
|
||||||
this->serializeType(des, item);
|
this->serializeType(des, item);
|
||||||
data = std::variant<Ts...>(std::in_place_index_t<Index>{},
|
data = std::variant<Ts...>(std::in_place_index_t<Index>{},
|
||||||
std::move(item));
|
std::move(item));
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user