[opencv] 118/251: build: reuse int32_t workaround from softfloat.hpp

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 3.3.0
in repository opencv.

commit 08c94aa5c0bb19f102a486d9e7bf6320e931ec68
Author: Alexander Alekhin <alexander.alekhin at intel.com>
Date:   Thu Jul 20 14:01:21 2017 +0300

    build: reuse int32_t workaround from softfloat.hpp
---
 modules/dnn/src/precomp.hpp          | 1 +
 modules/dnn/src/torch/THDiskFile.cpp | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/dnn/src/precomp.hpp b/modules/dnn/src/precomp.hpp
index d06e337..9383a08 100644
--- a/modules/dnn/src/precomp.hpp
+++ b/modules/dnn/src/precomp.hpp
@@ -41,6 +41,7 @@
 
 #include <opencv2/core.hpp>
 #include <opencv2/core/utils/trace.hpp>
+#include <opencv2/core/softfloat.hpp> // int32_t (MSVS 2010-2013)
 #include "cvconfig.h"
 #include <opencv2/dnn.hpp>
 #include <opencv2/dnn/all_layers.hpp>
diff --git a/modules/dnn/src/torch/THDiskFile.cpp b/modules/dnn/src/torch/THDiskFile.cpp
index ce5a5d8..5f63ced 100644
--- a/modules/dnn/src/torch/THDiskFile.cpp
+++ b/modules/dnn/src/torch/THDiskFile.cpp
@@ -3,9 +3,6 @@
 #include "THGeneral.h"
 #include "THDiskFile.h"
 #include "THFilePrivate.h"
-#if defined(_MSC_VER) && 1600 <= _MSC_VER
-#include <cstdint>
-#endif
 
 namespace TH
 {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git