Skip to content

Commit ee74499

Browse files
committed
replaced old xvector_variant with xvector_like_variant implementation
1 parent 9b3c3bd commit ee74499

6 files changed

Lines changed: 677 additions & 2199 deletions

File tree

include/xframe/xaxis_variant.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ namespace xf
6262
{
6363
using tmp_storage_type = xtl::variant<xaxis<L, S, MT>...>;
6464
using storage_type = add_default_axis_t<tmp_storage_type, S, L...>;
65-
using label_list = xvector_variant_cref<L...>;
65+
using label_list = xvector_variant_cref<std::vector<L>...>;
6666
using key_type = xtl::variant<typename xaxis<L, S, MT>::key_type...>;
6767
using key_reference = xtl::variant<xtl::xclosure_wrapper<const typename xaxis<L, S, MT>::key_type&>...>;
6868
using mapped_type = S;
@@ -540,7 +540,7 @@ namespace xf
540540

541541
inline const label_list& labels() const
542542
{
543-
return xget_vector<key_type>(m_axis.labels());
543+
return xget_vector<std::vector<key_type>>(m_axis.labels());
544544
};
545545

546546
inline bool is_sorted() const noexcept

0 commit comments

Comments
 (0)