From 7c445ee93de91cac6e2b6cb319fa61edbc7bb091 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <christophe.riccio@unity3d.com>
Date: Mon, 27 Aug 2018 23:25:00 +0200
Subject: [PATCH] Clean up GLM_FORCE_DEFAULT_ALIGNED_GENTYPES

---
 test/core/core_force_pure.cpp | 18 +++++++++---------
 test/core/core_type_vec4.cpp  |  1 -
 test/gtc/gtc_random.cpp       |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/test/core/core_force_pure.cpp b/test/core/core_force_pure.cpp
index a2df6ab6..1f370937 100644
--- a/test/core/core_force_pure.cpp
+++ b/test/core/core_force_pure.cpp
@@ -1,7 +1,7 @@
 #ifndef GLM_FORCE_PURE
 #	define GLM_FORCE_PURE
 #endif//GLM_FORCE_PURE
-#define GLM_FORCE_ALIGNED
+#define GLM_FORCE_DEFAULT_ALIGNED_GENTYPES
 #define GLM_FORCE_SWIZZLE
 #include <glm/ext/vector_relational.hpp>
 #include <glm/vector_relational.hpp>
@@ -12,7 +12,7 @@
 #include <ctime>
 #include <vector>
 
-int test_vec4_ctor()
+static int test_vec4_ctor()
 {
 	int Error = 0;
 
@@ -138,7 +138,7 @@ int test_vec4_ctor()
 	return Error;
 }
 
-int test_bvec4_ctor()
+static int test_bvec4_ctor()
 {
 	int Error = 0;
 
@@ -162,7 +162,7 @@ int test_bvec4_ctor()
 	return Error;
 }
 
-int test_vec4_operators()
+static int test_vec4_operators()
 {
 	int Error = 0;
 	
@@ -298,7 +298,7 @@ int test_vec4_operators()
 	return Error;
 }
 
-int test_vec4_equal()
+static int test_vec4_equal()
 {
 	int Error = 0;
 
@@ -319,7 +319,7 @@ int test_vec4_equal()
 	return Error;
 }
 
-int test_vec4_size()
+static int test_vec4_size()
 {
 	int Error = 0;
 
@@ -337,7 +337,7 @@ int test_vec4_size()
 	return Error;
 }
 
-int test_vec4_swizzle_partial()
+static int test_vec4_swizzle_partial()
 {
 	int Error = 0;
 
@@ -375,7 +375,7 @@ int test_vec4_swizzle_partial()
 	return Error;
 }
 
-int test_operator_increment()
+static int test_operator_increment()
 {
 	int Error(0);
 
@@ -429,7 +429,7 @@ namespace heap
 	}
 }//namespace heap
 
-int test_vec4_simd()
+static int test_vec4_simd()
 {
 	int Error = 0;
 
diff --git a/test/core/core_type_vec4.cpp b/test/core/core_type_vec4.cpp
index f69087fa..d37cc3a9 100644
--- a/test/core/core_type_vec4.cpp
+++ b/test/core/core_type_vec4.cpp
@@ -1,4 +1,3 @@
-#define GLM_FORCE_ALIGNED
 #define GLM_FORCE_SWIZZLE
 #include <glm/gtc/constants.hpp>
 #include <glm/gtc/vec1.hpp>
diff --git a/test/gtc/gtc_random.cpp b/test/gtc/gtc_random.cpp
index 004de1dd..60fb60c4 100644
--- a/test/gtc/gtc_random.cpp
+++ b/test/gtc/gtc_random.cpp
@@ -1,4 +1,4 @@
-#define GLM_FORCE_ALIGNED
+#define GLM_FORCE_DEFAULT_ALIGNED_GENTYPES
 #include <glm/gtc/random.hpp>
 #include <glm/gtc/epsilon.hpp>
 #include <glm/gtc/type_precision.hpp>