mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed long long warnings, fixed precision qualifier values on Clang where qualifiers had the same values

Browse Source
This commit is contained in:
Christophe Riccio 2016-07-16 22:34:07 +02:00
parent c80e142816
commit 6a6b54b699
3 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glm/detail/precision.hpp
View File

@ -10,13 +10,13 @@ namespace glm
highp, highp,
mediump, mediump,
lowp, lowp,
aligned_highp,
aligned_mediump,
aligned_lowp,
packed_highp = highp, packed_highp = highp,
packed_mediump = mediump, packed_mediump = mediump,
packed_lowp = lowp, packed_lowp = lowp,
packed = packed_highp, packed = packed_highp,
aligned_highp,
aligned_mediump,
aligned_lowp,
aligned = aligned_highp, aligned = aligned_highp,
# ifdef GLM_FORCE_ALIGNED # ifdef GLM_FORCE_ALIGNED
defaultp = aligned_highp defaultp = aligned_highp

27
glm/detail/type_int.hpp
View File

@ -35,23 +35,15 @@ namespace detail
typedef unsigned __int64 uint64; typedef unsigned __int64 uint64;
# elif GLM_COMPILER & GLM_COMPILER_GCC # elif GLM_COMPILER & GLM_COMPILER_GCC
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wno-long-long" # pragma GCC diagnostic ignored "-Wno-long-long"
__extension__ typedef signed long long sint64; __extension__ typedef signed long long sint64;
__extension__ typedef unsigned long long uint64; __extension__ typedef unsigned long long uint64;
# pragma GCC diagnostic pop
# elif (GLM_COMPILER & GLM_COMPILER_CLANG) # elif (GLM_COMPILER & GLM_COMPILER_CLANG)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wc++11-long-long" # pragma clang diagnostic ignored "-Wc++11-long-long"
typedef signed long long sint64; typedef signed long long sint64;
typedef unsigned long long uint64; typedef unsigned long long uint64;
# pragma clang diagnostic pop
# else//unknown compiler # else//unknown compiler
typedef signed long long sint64; typedef signed long long sint64;
typedef unsigned long long uint64; typedef unsigned long long uint64;
@ -184,16 +176,6 @@ namespace detail
{ {
typedef unsigned long type; typedef unsigned long type;
}; };
# if GLM_COMPILER & GLM_COMPILER_GCC
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wno-long-long"
# endif
# if GLM_COMPILER & GLM_COMPILER_CLANG
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wc++11-long-long"
# endif
template <> template <>
struct make_signed<long long> struct make_signed<long long>
@ -218,15 +200,6 @@ namespace detail
{ {
typedef unsigned long long type; typedef unsigned long long type;
}; };
# if GLM_COMPILER & GLM_COMPILER_GCC
# pragma GCC diagnostic pop
# endif
# if GLM_COMPILER & GLM_COMPILER_CLANG
# pragma clang diagnostic pop
# endif
# endif//GLM_HAS_MAKE_SIGNED # endif//GLM_HAS_MAKE_SIGNED
}//namespace detail }//namespace detail

9
test/gtx/gtx_io.cpp
View File

@ -14,9 +14,12 @@ namespace
if (cerberus) if (cerberus)
{ {
switch (a) { switch (a) {
case glm::highp: os << "hi"; break; case glm::highp: os << "uhi"; break;
case glm::mediump: os << "md"; break; case glm::mediump: os << "umd"; break;
case glm::lowp: os << "lo"; break; case glm::lowp: os << "ulo"; break;
case glm::aligned_highp: os << "ahi"; break;
case glm::aligned_mediump: os << "amd"; break;
case glm::aligned_lowp: os << "alo"; break;
} }
} }