Merge pull request #5571 from jas0n1ee:master

9a66191e · Maksim Shabunin · bd53a30e · 251610f6 · 9a66191e
Commit 9a66191e authored Nov 23, 2015 by Maksim Shabunin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

defs.h modules/hal/include/opencv2/hal/defs.h +1 -1

No files found.
--- a/modules/hal/include/opencv2/hal/defs.h
+++ b/modules/hal/include/opencv2/hal/defs.h
@@ -270,7 +270,7 @@
 */

 #if !defined _MSC_VER && !defined __BORLANDC__
-#  if defined __cplusplus && __cplusplus >= 201103L
+#  if defined __cplusplus && __cplusplus >= 201103L && !defined __APPLE__
 #    include <cstdint>
     typedef std::uint32_t uint;
 #  else