AuroraMiddleware/glm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

No more warnings for use of long long

Browse Source
This commit is contained in:
Christophe Riccio 2016-07-16 22:25:09 +02:00
parent 0671e609bb
commit c80e142816
2 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
glm/detail/type_int.hpp
View File

@ -43,9 +43,9 @@ namespace detail
# pragma GCC diagnostic pop # pragma GCC diagnostic pop
# elif GLM_COMPILER & GLM_COMPILER_CLANG # elif (GLM_COMPILER & GLM_COMPILER_CLANG)
# pragma clang diagnostic push # pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wno-c++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;
@ -108,13 +108,7 @@ namespace detail
{ {
typedef long type; typedef long type;
}; };
template <>
struct make_signed<long long>
{
typedef long long type;
};
template <> template <>
struct make_signed<unsigned char> struct make_signed<unsigned char>
{ {
@ -139,12 +133,6 @@ namespace detail
typedef long type; typedef long type;
}; };
template <>
struct make_signed<unsigned long long>
{
typedef long long type;
};
template <typename genType> template <typename genType>
struct make_unsigned struct make_unsigned
{}; {};
@ -173,12 +161,6 @@ namespace detail
typedef unsigned long type; typedef unsigned long type;
}; };
template <>
struct make_unsigned<long long>
{
typedef unsigned long long type;
};
template <> template <>
struct make_unsigned<unsigned char> struct make_unsigned<unsigned char>
{ {
@ -202,12 +184,49 @@ 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 <>
struct make_signed<long long>
{
typedef long long type;
};
template <>
struct make_signed<unsigned long long>
{
typedef long long type;
};
template <>
struct make_unsigned<long long>
{
typedef unsigned long long type;
};
template <> template <>
struct make_unsigned<unsigned long long> struct make_unsigned<unsigned long long>
{ {
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

1
readme.md
View File

@ -79,6 +79,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
- Added PowerPC CPUs detection - Added PowerPC CPUs detection
- Use Cuda built-in function for abs function implementation with Cuda compiler - Use Cuda built-in function for abs function implementation with Cuda compiler
- Factorized GLM_COMPILER_LLVM and GLM_COMPILER_APPLE_CLANG into GLM_COMPILER_CLANG - Factorized GLM_COMPILER_LLVM and GLM_COMPILER_APPLE_CLANG into GLM_COMPILER_CLANG
- No more warnings for use of long long
##### Fixes: ##### Fixes:
- Fixed GTX_extended_min_max filename typo #386 - Fixed GTX_extended_min_max filename typo #386