Commit 2e31f099 authored by neverlord's avatar neverlord

bugfix

parent b5df6ac7
...@@ -177,8 +177,8 @@ struct tdata<Head, Tail...> : tdata<Tail...> ...@@ -177,8 +177,8 @@ struct tdata<Head, Tail...> : tdata<Tail...>
template<typename... X> template<typename... X>
void tdata_set(tdata<X...>&, tdata<> const&) { } void tdata_set(tdata<X...>&, tdata<> const&) { }
template<typename... X, typename... Y> template<typename Head, typename... X, typename... Y>
void tdata_set(tdata<X...>& lhs, tdata<Y...> const& rhs) void tdata_set(tdata<Head, X...>& lhs, tdata<Head, Y...> const& rhs)
{ {
lhs.head = rhs.head; lhs.head = rhs.head;
tdata_set(lhs.tail(), rhs.tail()); tdata_set(lhs.tail(), rhs.tail());
......
...@@ -155,22 +155,13 @@ ExtendedType* extend_pattern(BasicType const* p) ...@@ -155,22 +155,13 @@ ExtendedType* extend_pattern(BasicType const* p)
{ {
ExtendedType* et = new ExtendedType; ExtendedType* et = new ExtendedType;
detail::tdata_set(et->m_data, p->m_data); detail::tdata_set(et->m_data, p->m_data);
//et->m_data = p->m_data;
for (size_t i = 0; i < BasicType::size; ++i) for (size_t i = 0; i < BasicType::size; ++i)
{ {
if (p->m_data_ptr[i] != nullptr) if (p->m_data_ptr[i] != nullptr)
{ {
et->m_data_ptr[i] = et->m_data.at(i);
} }
//et->m_data_ptr[i] = (p->m_data_ptr[i]) ? et->m_data.at(i)
// : nullptr;
}
/*
for (size_t j = BasicType::size; j < ExtendedType::size; ++j)
{
et->m_data_ptr[j] = nullptr;
} }
*/
return et; return et;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment