Browse Source

Fixed build

Christophe Riccio 8 years ago
parent
commit
26c395c78b
1 changed files with 3 additions and 3 deletions
  1. 3 3
      test/core/core_type_vec4.cpp

+ 3 - 3
test/core/core_type_vec4.cpp

@@ -525,17 +525,17 @@ static int test_inheritance()
 	{
 		my_vec4()
 			: glm::vec4(76.f, 75.f, 74.f, 73.f)
-			, data(82)
+			, member(82)
 		{}
 
-		int data;
+		int member;
 	};
 
 	int Error = 0;
 
 	my_vec4 v;
 
-	Error += v.data == 82 ? 0 : 1;
+	Error += v.member == 82 ? 0 : 1;
 	Error += glm::epsilonEqual(v.x, 76.f, glm::epsilon<float>()) ? 0 : 1;
 	Error += glm::epsilonEqual(v.y, 75.f, glm::epsilon<float>()) ? 0 : 1;
 	Error += glm::epsilonEqual(v.z, 74.f, glm::epsilon<float>()) ? 0 : 1;