Fix conflicts and merge

This commit is contained in:
Gael Guennebaud
2019-01-30 15:57:08 +01:00
20 changed files with 525 additions and 293 deletions

View File

@@ -184,7 +184,8 @@ template<typename T> struct unpacket_traits
enum
{
size = 1,
alignment = 1
alignment = 1,
vectorizable = false
};
};