Merge branch 'development'

# Conflicts:
#	include/etl/multi_array.h
This commit is contained in:
John Wellbelove 2019-04-27 16:30:45 +01:00
parent 42c3ee4938
commit aad2be1de7

View File

@ -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
}