adding std to cstdint typedef of uint32_t

12 years ago · ed29d91d42
parent b595d73d6d
commit ed29d91d42
2 changed files with 3 additions and 2 deletions
--- a/cmake/OpenCVFindLibsGUI.cmake
+++ b/cmake/OpenCVFindLibsGUI.cmake
@ -70,7 +70,7 @@ endif(WITH_OPENGL)
 if(APPLE)
  if(WITH_CARBON)
    set(HAVE_CARBON YES)
-  elseif(NOT IOS)
+  elif(NOT IOS)
    set(HAVE_COCOA YES)
  endif()
 endif()
--- a/modules/core/include/opencv2/core/cvdef.h
+++ b/modules/core/include/opencv2/core/cvdef.h
@ -201,10 +201,11 @@
 #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
-   typedef uint32_t uint;
 #else
   typedef unsigned uint;
 #endif