anulax
/
glm
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Workaround GCC compiler bug with constexpr support

Browse Source
master
Christophe Riccio ago%!(EXTRA string=10 years)
parent 152c71abff
commit 71401d14aa
8 changed files with 13 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      glm/detail/setup.hpp
  2. 8
      glm/detail/type_vec1.hpp
  3. 2
      glm/detail/type_vec2.hpp
  4. 2
      glm/detail/type_vec2.inl
  5. 2
      glm/detail/type_vec3.hpp
  6. 2
      glm/detail/type_vec3.inl
  7. 2
      glm/detail/type_vec4.hpp
  8. 2
      glm/detail/type_vec4.inl

7
glm/detail/setup.hpp
Unescape View File

@ -737,6 +737,13 @@
# define GLM_RELAXED_CONSTEXPR const # define GLM_RELAXED_CONSTEXPR const
#endif #endif
// GCC 4.6 has a bug causing a compiler crash
#if GLM_COMPILER & GLM_COMPILER_GCC
# define GLM_CONSTEXPR_GCC
#else
# define GLM_CONSTEXPR_GCC GLM_CONSTEXPR
#endif
#ifdef GLM_FORCE_EXPLICIT_CTOR #ifdef GLM_FORCE_EXPLICIT_CTOR
# define GLM_EXPLICIT explicit # define GLM_EXPLICIT explicit
#else #else

8
glm/detail/type_vec1.hpp
Unescape View File

@ -102,14 +102,6 @@ namespace glm
// -- Explicit basic constructors -- // -- Explicit basic constructors --
GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec1(ctor); GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec1(ctor);
// GCC 4.6 has a bug causing a compiler crash
# if GLM_COMPILER & GLM_COMPILER_GCC
# define GLM_CONSTEXPR_GCC
# else
# define GLM_CONSTEXPR_GCC GLM_CONSTEXPR
# endif
GLM_FUNC_DECL GLM_CONSTEXPR_GCC explicit tvec1(T scalar); GLM_FUNC_DECL GLM_CONSTEXPR_GCC explicit tvec1(T scalar);
// -- Conversion vector constructors -- // -- Conversion vector constructors --

2
glm/detail/type_vec2.hpp
Unescape View File

@ -102,7 +102,7 @@ namespace glm
// -- Explicit basic constructors -- // -- Explicit basic constructors --
GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec2(ctor); GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec2(ctor);
GLM_FUNC_DECL GLM_CONSTEXPR explicit tvec2(T scalar); GLM_FUNC_DECL GLM_CONSTEXPR_GCC explicit tvec2(T scalar);
GLM_FUNC_DECL GLM_CONSTEXPR tvec2(T s1, T s2); GLM_FUNC_DECL GLM_CONSTEXPR tvec2(T s1, T s2);
// -- Conversion constructors -- // -- Conversion constructors --

2
glm/detail/type_vec2.inl
Unescape View File

@ -72,7 +72,7 @@ namespace glm
{} {}
template <typename T, precision P> template <typename T, precision P>
GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec2<T, P>::tvec2(T scalar) GLM_FUNC_QUALIFIER GLM_CONSTEXPR_GCC tvec2<T, P>::tvec2(T scalar)
: x(scalar), y(scalar) : x(scalar), y(scalar)
{} {}

2
glm/detail/type_vec3.hpp
Unescape View File

@ -103,7 +103,7 @@ namespace glm
// -- Explicit basic constructors -- // -- Explicit basic constructors --
GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec3(ctor); GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec3(ctor);
GLM_FUNC_DECL GLM_CONSTEXPR explicit tvec3(T scalar); GLM_FUNC_DECL GLM_CONSTEXPR_GCC explicit tvec3(T scalar);
GLM_FUNC_DECL GLM_CONSTEXPR tvec3(T a, T b, T c); GLM_FUNC_DECL GLM_CONSTEXPR tvec3(T a, T b, T c);
// -- Conversion scalar constructors -- // -- Conversion scalar constructors --

2
glm/detail/type_vec3.inl
Unescape View File

@ -89,7 +89,7 @@ namespace glm
{} {}
template <typename T, precision P> template <typename T, precision P>
GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec3<T, P>::tvec3(T scalar) GLM_FUNC_QUALIFIER GLM_CONSTEXPR_GCC tvec3<T, P>::tvec3(T scalar)
: x(scalar), y(scalar), z(scalar) : x(scalar), y(scalar), z(scalar)
{} {}

2
glm/detail/type_vec4.hpp
Unescape View File

@ -158,7 +158,7 @@ namespace detail
// -- Explicit basic constructors -- // -- Explicit basic constructors --
GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec4(ctor); GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec4(ctor);
GLM_FUNC_DECL GLM_CONSTEXPR explicit tvec4(T scalar); GLM_FUNC_DECL GLM_CONSTEXPR_GCC explicit tvec4(T scalar);
GLM_FUNC_DECL GLM_CONSTEXPR tvec4(T a, T b, T c, T d); GLM_FUNC_DECL GLM_CONSTEXPR tvec4(T a, T b, T c, T d);
// -- Conversion scalar constructors -- // -- Conversion scalar constructors --

2
glm/detail/type_vec4.inl
Unescape View File

@ -63,7 +63,7 @@ namespace glm
{} {}
template <typename T, precision P> template <typename T, precision P>
GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec4<T, P>::tvec4(T scalar) GLM_FUNC_QUALIFIER GLM_CONSTEXPR_GCC tvec4<T, P>::tvec4(T scalar)
: x(scalar), y(scalar), z(scalar), w(scalar) : x(scalar), y(scalar), z(scalar), w(scalar)
{} {}

Write Preview
Loading…
Cancel
Save