diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp
index e180a5bd..6ad65a48 100644
--- a/glm/core/setup.hpp
+++ b/glm/core/setup.hpp
@@ -402,7 +402,7 @@
 
 // User defines: GLM_FORCE_INLINE GLM_FORCE_CUDA
 
-#if(defined(GLM_FORCE_CUDA) || (defined(GLM_COMPILER) && (GLM_COMPILER >= GLM_COMPILER_CUDA30)))
+#if(defined(GLM_FORCE_CUDA) || (defined(__CUDACC__)))
 #   define GLM_CUDA_FUNC_DEF __device__ __host__ 
 #	define GLM_CUDA_FUNC_DECL __device__ __host__ 
 #else
diff --git a/glm/gtx/matrix_operation.inl b/glm/gtx/matrix_operation.inl
index d0b71e64..0d52fbb1 100644
--- a/glm/gtx/matrix_operation.inl
+++ b/glm/gtx/matrix_operation.inl
@@ -8,7 +8,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace glm{
-namespace gtc{
+namespace gtx{
 namespace matrix_operation
 {
 	template <typename valType>