From 26c395c78b5b6bf0772bfe57e641d8b54d2595fb Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 4 Jan 2018 17:14:27 +0100 Subject: [PATCH] Fixed build --- test/core/core_type_vec4.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/core/core_type_vec4.cpp b/test/core/core_type_vec4.cpp index 9f40771d..24552f98 100644 --- a/test/core/core_type_vec4.cpp +++ b/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()) ? 0 : 1; Error += glm::epsilonEqual(v.y, 75.f, glm::epsilon()) ? 0 : 1; Error += glm::epsilonEqual(v.z, 74.f, glm::epsilon()) ? 0 : 1;