Merge pull request #16459 from nh2:patch-1

591f4270 · Alexander Alekhin · ecbba852 · 70cbc3d8 · 591f4270
Commit 591f4270 authored Jan 30, 2020 by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

cvdef.h modules/core/include/opencv2/core/cvdef.h +5 -0

No files found.
--- a/modules/core/include/opencv2/core/cvdef.h
+++ b/modules/core/include/opencv2/core/cvdef.h
@@ -181,7 +181,12 @@ namespace cv {
 #undef abs
 #undef Complex

+#if defined __cplusplus
+#include <limits>
+#else
 #include <limits.h>
+#endif
+
 #include "opencv2/core/hal/interface.h"

 #if defined __ICL