new gcc version

diff --git a/src/graphics/gl_traits.hpp b/src/graphics/gl_traits.hpp
index 89d2dea041f902c06b06c8be088ebaefecaa79b7..db81e670d7ab33046fed01a51d984454ef44b5df 100644 (file)
--- a/src/graphics/gl_traits.hpp
+++ b/src/graphics/gl_traits.hpp
@@ -71,7 +71,6 @@ template<> struct gl_traits<double> {
 
 // composite types
 
 
 // composite types
 

-template<>

 template<class T, glm::precision P>
 struct gl_traits<TVEC1<T, P>> {
        static constexpr GLint size = 1;
 template<class T, glm::precision P>
 struct gl_traits<TVEC1<T, P>> {
        static constexpr GLint size = 1;


@@ -82,7 +81,6 @@ constexpr GLint gl_traits<TVEC1<T, P>>::size;
 template<class T, glm::precision P>
 constexpr GLenum gl_traits<TVEC1<T, P>>::type;
 
 template<class T, glm::precision P>
 constexpr GLenum gl_traits<TVEC1<T, P>>::type;
 

-template<>

 template<class T, glm::precision P>
 struct gl_traits<TVEC2<T, P>> {
        static constexpr GLint size = 2;
 template<class T, glm::precision P>
 struct gl_traits<TVEC2<T, P>> {
        static constexpr GLint size = 2;


@@ -93,7 +91,6 @@ constexpr GLint gl_traits<TVEC2<T, P>>::size;
 template<class T, glm::precision P>
 constexpr GLenum gl_traits<TVEC2<T, P>>::type;
 
 template<class T, glm::precision P>
 constexpr GLenum gl_traits<TVEC2<T, P>>::type;
 

-template<>

 template<class T, glm::precision P>
 struct gl_traits<TVEC3<T, P>> {
        static constexpr GLint size = 3;
 template<class T, glm::precision P>
 struct gl_traits<TVEC3<T, P>> {
        static constexpr GLint size = 3;


@@ -104,7 +101,6 @@ constexpr GLint gl_traits<TVEC3<T, P>>::size;
 template<class T, glm::precision P>
 constexpr GLenum gl_traits<TVEC3<T, P>>::type;
 
 template<class T, glm::precision P>
 constexpr GLenum gl_traits<TVEC3<T, P>>::type;
 

-template<>

 template<class T, glm::precision P>
 struct gl_traits<TVEC4<T, P>> {
        static constexpr GLint size = 4;
 template<class T, glm::precision P>
 struct gl_traits<TVEC4<T, P>> {
        static constexpr GLint size = 4;

diff --git a/src/graphics/glm.hpp b/src/graphics/glm.hpp
index db886e0fad1acd0554ceaed192cfac6939f84fa8..cf766574d3d81fff6d290656581f4cc56b055d46 100644 (file)
--- a/src/graphics/glm.hpp
+++ b/src/graphics/glm.hpp
@@ -5,6 +5,8 @@
 #  define GLM_FORCE_RADIANS 1
 #endif
 
 #  define GLM_FORCE_RADIANS 1
 #endif
 

+#define GLM_ENABLE_EXPERIMENTAL
+

 #include <glm/glm.hpp>
 
 // GLM moved tvec[1234] from glm::detail to glm in 0.9.6
 #include <glm/glm.hpp>
 
 // GLM moved tvec[1234] from glm::detail to glm in 0.9.6