organicmaps/glm
13
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2025-04-07 06:25:00 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Fixed ticket #157, conflict with WinGDI.h

Browse source
This commit is contained in:
Christophe Riccio 2011-12-17 18:55:30 +00:00
parent 77253ea03f
commit de3305ccef
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
glm/core/_detail.hpp
View file

@ -357,82 +357,82 @@ namespace detail
{
enum
{
ERROR,
FLOAT,
INT
GLM_ERROR,
GLM_FLOAT,
GLM_INT
};
};
template <typename T>
struct float_or_int_trait
{
enum{ID = float_or_int_value::ERROR};
enum{ID = float_or_int_value::GLM_ERROR};
};
template <>
struct float_or_int_trait<int8>
{
enum{ID = float_or_int_value::INT};
enum{ID = float_or_int_value::GLM_INT};
};
template <>
struct float_or_int_trait<int16>
{
enum{ID = float_or_int_value::INT};
enum{ID = float_or_int_value::GLM_INT};
};
template <>
struct float_or_int_trait<int32>
{
enum{ID = float_or_int_value::INT};
enum{ID = float_or_int_value::GLM_INT};
};
template <>
struct float_or_int_trait<int64>
{
enum{ID = float_or_int_value::INT};
enum{ID = float_or_int_value::GLM_INT};
};
template <>
struct float_or_int_trait<uint8>
{
enum{ID = float_or_int_value::INT};
enum{ID = float_or_int_value::GLM_INT};
};
template <>
struct float_or_int_trait<uint16>
{
enum{ID = float_or_int_value::INT};
enum{ID = float_or_int_value::GLM_INT};
};
template <>
struct float_or_int_trait<uint32>
{
enum{ID = float_or_int_value::INT};
enum{ID = float_or_int_value::GLM_INT};
};
template <>
struct float_or_int_trait<uint64>
{
enum{ID = float_or_int_value::INT};
enum{ID = float_or_int_value::GLM_INT};
};
template <>
struct float_or_int_trait<float16>
{
enum{ID = float_or_int_value::FLOAT};
enum{ID = float_or_int_value::GLM_FLOAT};
};
template <>
struct float_or_int_trait<float32>
{
enum{ID = float_or_int_value::FLOAT};
enum{ID = float_or_int_value::GLM_FLOAT};
};
template <>
struct float_or_int_trait<float64>
{
enum{ID = float_or_int_value::FLOAT};
enum{ID = float_or_int_value::GLM_FLOAT};
};
}//namespace detail

4
glm/core/func_exponential.inl
View file

@ -89,7 +89,7 @@ namespace glm
namespace detail
{
template <int PATH = float_or_int_value::ERROR>
template <int PATH = float_or_int_value::GLM_ERROR>
struct compute_log2
{
template <typename T>
@ -101,7 +101,7 @@ namespace detail
};
template <>
struct compute_log2<float_or_int_value::FLOAT>
struct compute_log2<float_or_int_value::GLM_FLOAT>
{
template <typename T>
T operator() (T const & Value) const

2
glm/gtx/integer.inl
View file

@ -55,7 +55,7 @@ namespace detail
}
template <>
struct compute_log2<float_or_int_value::INT>
struct compute_log2<float_or_int_value::GLM_INT>
{
template <typename T>
T operator() (T const & Value) const