Merge pull request #1253 from kamjagin:fixingCompilationOnOSX

2013-08-15 11:54:54 +04:00
parent d09c89c63e ed29d91d42
commit 556028eff5
2 changed files with 4 additions and 8 deletions
--- a/modules/core/include/opencv2/core/cvdef.h
+++ b/modules/core/include/opencv2/core/cvdef.h
@@ -201,8 +201,10 @@
 #if !defined _MSC_VER && !defined __BORLANDC__
 #  if defined __cplusplus && __cplusplus >= 201103L
 #    include <cstdint>
+     typedef std::uint32_t uint;
 #  else
 #    include <stdint.h>
+     typedef uint32_t uint;
 #  endif
 #else
   typedef unsigned uint;