mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 04:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

4
glm/core/func_exponential.inl
View File

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

2
glm/gtx/integer.inl
View File

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