Merge pull request #183 from dachziegel/0.9.6

added GLM_FUNC_DECL to avoid nvcc warnings #183

glm/detail/setup.hpp

@@ -211,6 +211,9 @@
 
 // CUDA
 #elif defined(__CUDACC__)
+#	if !defined(CUDA_VERSION) && !defined(GLM_FORCE_CUDA)
+#		include <cuda.h>  // make sure version is defined since nvcc does not define it itself! 
+#	endif
 #	if CUDA_VERSION < 3000
 #		error "GLM requires CUDA 3.0 or higher"
 #	else

glm/detail/type_mat2x3.hpp

@@ -153,7 +153,7 @@ namespace detail
 		T const & s);
 
 	template <typename T, precision P>
-	tmat2x3<T, P> operator+ (
+	GLM_FUNC_DECL tmat2x3<T, P> operator+ (
 		tmat2x3<T, P> const & m1,
 		tmat2x3<T, P> const & m2);