From d9a3aab6913fcd6cdb2083fd0be1aa8b1e89ad55 Mon Sep 17 00:00:00 2001
From: Anne Gropler <anne.gropler@student.hpi.uni-potsdam.de>
Date: Mon, 30 Jul 2018 14:24:10 +0200
Subject: [PATCH 1/3] updated chapter number for acknowledgements

---
 manual.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manual.md b/manual.md
index 8f33a6ae..f4c82e7e 100644
--- a/manual.md
+++ b/manual.md
@@ -78,7 +78,7 @@
 + [9.4. Tutorials using GLM](#section9_4)
 + [9.5. Equivalent for other languages](#section9_5)
 + [9.6. Alternatives to GLM](#section9_6)
-+ [9.8. Acknowledgements](#section9_8)
++ [9.7. Acknowledgements](#section9_7)
 
 ---
 ## <a name="section0"></a> Licenses

From d97e4c2483bcdabc17183bacc9ff1bc8da694612 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <christophe.riccio@unity3d.com>
Date: Tue, 31 Jul 2018 11:12:10 +0200
Subject: [PATCH 2/3] Fixed Clang build

---
 test/gtx/gtx_load.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/gtx/gtx_load.cpp b/test/gtx/gtx_load.cpp
index b6ce1ccd..d8ae8696 100644
--- a/test/gtx/gtx_load.cpp
+++ b/test/gtx/gtx_load.cpp
@@ -1,13 +1,14 @@
 #define GLM_FORCE_ALIGNED_GENTYPES
 #define GLM_ENABLE_EXPERIMENTAL
+#include <glm/glm.hpp>
+/*
+#if GLM_USE_SIMD == GLM_ENABLE && GLM_USE_ALIGNED_GENTYPES == GLM_ENABLE
+
 #include <glm/gtx/common.hpp>
 #include <glm/gtc/integer.hpp>
 #include <glm/gtc/epsilon.hpp>
 #include <glm/gtc/type_aligned.hpp>
 #include <glm/ext/vector_relational.hpp>
-#include <glm/glm.hpp>
-/*
-#if GLM_USE_SIMD == GLM_ENABLE && GLM_USE_ALIGNED_GENTYPES == GLM_ENABLE
 
 namespace glm
 {

From 0fb8b56f63bb86dcce82f1db284f7dc814f15083 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <christophe.riccio@unity3d.com>
Date: Tue, 31 Jul 2018 14:28:14 +0200
Subject: [PATCH 3/3] Removed useless GLM_FORCE_ALIGNED_GENTYPES

---
 glm/detail/setup.hpp                      | 2 +-
 glm/gtc/type_aligned.hpp                  | 2 +-
 test/core/core_force_aligned_gentypes.cpp | 2 --
 test/gtc/gtc_type_aligned.cpp             | 1 -
 test/gtx/gtx_load.cpp                     | 1 -
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
index 8284db5e..9f42d01f 100644
--- a/glm/detail/setup.hpp
+++ b/glm/detail/setup.hpp
@@ -585,7 +585,7 @@ namespace glm
 ///////////////////////////////////////////////////////////////////////////////////
 // Configure the use of aligned gentypes
 
-#if defined(GLM_FORCE_ALIGNED_GENTYPES) && GLM_HAS_ALIGNOF && (GLM_LANG & GLM_LANG_CXXMS_FLAG)
+#if GLM_HAS_ALIGNOF && (GLM_LANG & GLM_LANG_CXXMS_FLAG)
 #	define GLM_USE_ALIGNED_GENTYPES GLM_ENABLE
 #else
 #	define GLM_USE_ALIGNED_GENTYPES GLM_DISABLE
diff --git a/glm/gtc/type_aligned.hpp b/glm/gtc/type_aligned.hpp
index 6d9f11dd..b42ffcf5 100644
--- a/glm/gtc/type_aligned.hpp
+++ b/glm/gtc/type_aligned.hpp
@@ -13,7 +13,7 @@
 #pragma once
 
 #if !GLM_USE_ANONYMOUS_STRUCT
-#	error "GLM: Aligned gentypes require to enable C++ language extensions and to define GLM_FORCE_ALIGNED_GENTYPES before including GLM headers."
+#	error "GLM: Aligned gentypes require to enable C++ language extensions."
 #endif
 
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
diff --git a/test/core/core_force_aligned_gentypes.cpp b/test/core/core_force_aligned_gentypes.cpp
index 068d7efa..70713c4b 100644
--- a/test/core/core_force_aligned_gentypes.cpp
+++ b/test/core/core_force_aligned_gentypes.cpp
@@ -1,5 +1,3 @@
-#define GLM_FORCE_ALIGNED_GENTYPES
-
 #include <glm/glm.hpp>
 #include <glm/ext.hpp>
 
diff --git a/test/gtc/gtc_type_aligned.cpp b/test/gtc/gtc_type_aligned.cpp
index 67e5db85..d348953b 100644
--- a/test/gtc/gtc_type_aligned.cpp
+++ b/test/gtc/gtc_type_aligned.cpp
@@ -1,4 +1,3 @@
-#define GLM_FORCE_ALIGNED_GENTYPES
 #include <glm/glm.hpp>
 
 #if GLM_USE_ALIGNED_GENTYPES == GLM_ENABLE
diff --git a/test/gtx/gtx_load.cpp b/test/gtx/gtx_load.cpp
index d8ae8696..f3634232 100644
--- a/test/gtx/gtx_load.cpp
+++ b/test/gtx/gtx_load.cpp
@@ -1,4 +1,3 @@
-#define GLM_FORCE_ALIGNED_GENTYPES
 #define GLM_ENABLE_EXPERIMENTAL
 #include <glm/glm.hpp>
 /*