mirror of
https://github.com/ETLCPP/etl.git
synced 2026-06-26 20:38:45 +08:00
Merge branch 'development'
# Conflicts: # include/etl/multi_array.h
This commit is contained in:
parent
42c3ee4938
commit
aad2be1de7
@ -59,8 +59,8 @@ namespace etl
|
||||
};
|
||||
}
|
||||
|
||||
template <typename T, const size_t D1, const size_t... Dx>
|
||||
using multi_array = typename private_multi_array::multi_array_t<T, D1, Dx...>::type;
|
||||
template <typename T, const size_t... Dx>
|
||||
using multi_array = typename private_multi_array::multi_array_t<T, Dx...>::type;
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user