mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed build

Browse Source
This commit is contained in:
Christophe Riccio 2016-05-23 21:57:26 +02:00
parent 3f74efa2e0
commit 8b9d205178
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glm/detail/type_vec4.inl
View File

@ -68,7 +68,6 @@ namespace detail
return tvec4<T, P>(a.x / b.x, a.y / b.y, a.z / b.z, a.w / b.w); return tvec4<T, P>(a.x / b.x, a.y / b.y, a.z / b.z, a.w / b.w);
} }
}; };
<<<<<<< HEAD
template <typename T, precision P> template <typename T, precision P>
struct compute_vec4_mod struct compute_vec4_mod
@ -123,8 +122,6 @@ namespace detail
return tvec4<T, P>(a.x >> b.x, a.y >> b.y, a.z >> b.z, a.w >> b.w); return tvec4<T, P>(a.x >> b.x, a.y >> b.y, a.z >> b.z, a.w >> b.w);
} }
}; };
=======
>>>>>>> simd
}//namespace detail }//namespace detail
// -- Implicit basic constructors -- // -- Implicit basic constructors --