diff --git a/glm/core/_detail.hpp b/glm/core/_detail.hpp index afce2fef..4d80db53 100644 --- a/glm/core/_detail.hpp +++ b/glm/core/_detail.hpp @@ -378,12 +378,12 @@ namespace detail # define GLM_RESTRICT_VAR __restrict # define GLM_CONSTEXPR #elif(GLM_COMPILER & GLM_COMPILER_INTEL) -# define GLM_DEPRECATED -# define GLM_ALIGN(x) __declspec(align(x)) -# define GLM_ALIGNED_STRUCT(x) __declspec(align(x)) struct -# define GLM_RESTRICT -# define GLM_RESTRICT_VAR __restrict -# define GLM_CONSTEXPR +# define GLM_DEPRECATED +# define GLM_ALIGN(x) __declspec(align(x)) +# define GLM_ALIGNED_STRUCT(x) __declspec(align(x)) struct +# define GLM_RESTRICT +# define GLM_RESTRICT_VAR __restrict +# define GLM_CONSTEXPR #elif((GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_LLVM_GCC)) && (GLM_COMPILER >= GLM_COMPILER_GCC31)) # define GLM_DEPRECATED __attribute__((__deprecated__)) # define GLM_ALIGN(x) __attribute__((aligned(x))) diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index abf3f23d..08ba59aa 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -686,29 +686,31 @@ // User defines: GLM_FORCE_INLINE GLM_FORCE_CUDA #if(defined(GLM_FORCE_CUDA) || (GLM_COMPILER & GLM_COMPILER_CUDA)) -# define GLM_CUDA_FUNC_DEF __device__ __host__ +# define GLM_CUDA_FUNC_DEF __device__ __host__ # define GLM_CUDA_FUNC_DECL __device__ __host__ #else -# define GLM_CUDA_FUNC_DEF +# define GLM_CUDA_FUNC_DEF # define GLM_CUDA_FUNC_DECL #endif #if GLM_COMPILER & GLM_COMPILER_GCC -#define GLM_VAR_USED __attribute__ ((unused)) +# define GLM_VAR_USED __attribute__ ((unused)) #else -#define GLM_VAR_USED +# define GLM_VAR_USED #endif #if(defined(GLM_FORCE_INLINE)) -# if((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2005)) -# define GLM_INLINE __forceinline -# elif((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC34)) -# define GLM_INLINE __attribute__((always_inline)) -# else -# define GLM_INLINE inline -# endif//GLM_COMPILER +# if((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2005)) +# define GLM_INLINE __forceinline +# elif((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC34)) +# define GLM_INLINE __attribute__((always_inline)) +# elif(GLM_COMPILER & GLM_COMPILER_CLANG) +# define GLM_INLINE __attribute__((always_inline)) +# else +# define GLM_INLINE inline +# endif//GLM_COMPILER #else -# define GLM_INLINE inline +# define GLM_INLINE inline #endif//defined(GLM_FORCE_INLINE) #define GLM_FUNC_DECL GLM_CUDA_FUNC_DECL