Merge pull request #12832 from kmansoo:fix-compile-errors-on-nvcc10

80c64fce · Alexander Alekhin · df6728e6 · 4d1f0ef2 · 80c64fce
Commit 80c64fce authored Oct 18, 2018 by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

types_c.h modules/core/include/opencv2/core/types_c.h +1 -1

No files found.
--- a/modules/core/include/opencv2/core/types_c.h
+++ b/modules/core/include/opencv2/core/types_c.h
@@ -1353,7 +1353,7 @@ CvSlice;
 CV_INLINE  CvSlice  cvSlice( int start, int end )
 {
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus) && !defined(__CUDACC__))
    CvSlice slice = { start, end };
 #else
    CvSlice slice(start, end);