1 --- blender-2.79b/intern/itasc/kdl/tree.hpp~ 2018-03-23 16:22:25.000000000 +0100
2 +++ blender-2.79b/intern/itasc/kdl/tree.hpp 2019-04-07 14:56:10.531752354 +0200
6 // Eigen allocator is needed for alignment of Eigen data types
7 - typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<std::string, TreeElement> > > SegmentMap;
8 + typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<const std::string, TreeElement> > > SegmentMap;
12 --- blender-2.79b/intern/cycles/util/util_sseb.h~ 2018-03-23 16:22:25.000000000 +0100
13 +++ blender-2.79b/intern/cycles/util/util_sseb.h 2019-04-07 15:00:05.901328020 +0200
15 __forceinline const sseb unpackhi( const sseb& a, const sseb& b ) { return _mm_unpackhi_ps(a, b); }
17 template<size_t i0, size_t i1, size_t i2, size_t i3> __forceinline const sseb shuffle( const sseb& a ) {
18 - return _mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0));
19 + return _mm_castsi128_ps(_mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0)));
22 template<> __forceinline const sseb shuffle<0, 1, 0, 1>( const sseb& a ) {