From 17737868ade7c54848c9ebc09377bb3bc8262637 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Mon, 16 Jan 2017 17:29:28 +0000
Subject: [PATCH] Both paths for OpenCV, first to vc14 and second to vc12

---
 src/cuda.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/cuda.h b/src/cuda.h
index 29b1eef..32aaabb 100644
--- a/src/cuda.h
+++ b/src/cuda.h
@@ -1,6 +1,10 @@
 #ifndef CUDA_H
 #define CUDA_H
 
+#if defined(_MSC_VER) && _MSC_VER < 1900
+	#define inline __inline
+#endif
+
 extern int gpu_index;
 
 #ifdef GPU

--
Gitblit v1.10.0