From e83d8e56d56978e5c2e571b8b4bf05b90a851ce0 Mon Sep 17 00:00:00 2001 From: AlexeyAB <alexeyab84@gmail.com> Date: Sun, 15 Jan 2017 22:31:55 +0000 Subject: [PATCH] Fixed paths to OpenCV from vc12 to vc14 --- 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