From afd58dcdc5200de1cc8f1f3744664a124ff6fdb2 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <mail@g-truc.net>
Date: Fri, 21 Nov 2014 22:13:04 +0100
Subject: [PATCH] Used std features within GLM without redeclaring

---
 glm/detail/setup.hpp | 2 +-
 readme.txt           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
index d3e09a9b..4a59f971 100644
--- a/glm/detail/setup.hpp
+++ b/glm/detail/setup.hpp
@@ -773,7 +773,7 @@
 
 namespace glm
 {
-	typedef std::size_t size_t;
+	using std::size_t;
 #if defined(GLM_FORCE_SIZE_T_LENGTH) || defined(GLM_FORCE_SIZE_FUNC)
 	typedef size_t length_t;
 #else
diff --git a/readme.txt b/readme.txt
index fac64573..cb1428ab 100644
--- a/readme.txt
+++ b/readme.txt
@@ -74,6 +74,7 @@ Improvements:
 - Rewrited of GTX_fast_trigonometry #264 #265
 - Made types trivially copyable #263
 - Removed <iostream> in GLM tests
+- Used std features within GLM without redeclaring
 
 Fixes:
 - Fixed std::nextafter not supported with C++11 on Android #217