Fixed initializer list ambiguity (#159, #160)

2014-02-08 12:40:34 +01:00
parent 638d49b549
commit 1d981dd344
26 changed files with 59 additions and 384 deletions
--- a/test/core/core_type_mat4x4.cpp
+++ b/test/core/core_type_mat4x4.cpp
@@ -189,6 +189,19 @@ int test_ctr()
 {
 	int Error(0);

+	{
+		glm::vec4 V{0, 1, 2, 3};
+
+		glm::mat4 M{
+			{0, 1, 2, 3},
+			{4, 5, 6, 7},
+			{8, 9, 10, 11},
+			{12, 13, 14, 15}};
+	}
+
+	glm::mat4 m4{
+		{0, 1, 2, 3}};
+
 #if(GLM_HAS_INITIALIZER_LISTS)
 	glm::mat4 m0(
 		glm::vec4(0, 1, 2, 3),