Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 650592 | Differences between
and this patch

Collapse All | Expand All

(-)blender-2.79b-orig/intern/cycles/util/util_sseb.h (-1 / +1 lines)
Lines 116-122 Link Here
116
__forceinline const sseb unpackhi( const sseb& a, const sseb& b ) { return _mm_unpackhi_ps(a, b); }
116
__forceinline const sseb unpackhi( const sseb& a, const sseb& b ) { return _mm_unpackhi_ps(a, b); }
117
117
118
template<size_t i0, size_t i1, size_t i2, size_t i3> __forceinline const sseb shuffle( const sseb& a ) {
118
template<size_t i0, size_t i1, size_t i2, size_t i3> __forceinline const sseb shuffle( const sseb& a ) {
119
	return _mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0));
119
	return _mm_castsi128_ps(_mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0)));
120
}
120
}
121
121
122
template<> __forceinline const sseb shuffle<0, 1, 0, 1>( const sseb& a ) {
122
template<> __forceinline const sseb shuffle<0, 1, 0, 1>( const sseb& a ) {
(-)blender-2.79b-orig/intern/itasc/kdl/tree.hpp (-1 / +1 lines)
Lines 34-40 Link Here
34
    //Forward declaration
34
    //Forward declaration
35
    class TreeElement;
35
    class TreeElement;
36
    // Eigen allocator is needed for alignment of Eigen data types
36
    // Eigen allocator is needed for alignment of Eigen data types
37
    typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<std::string, TreeElement> > > SegmentMap;
37
    typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<const std::string, TreeElement> > > SegmentMap;
38
38
39
    class TreeElement
39
    class TreeElement
40
    {
40
    {

Return to bug 650592