build: reuse int32_t workaround from softfloat.hpp

08c94aa5 · Alexander Alekhin · 1989bc33 · 08c94aa5 · 08c94aa5
Commit 08c94aa5 authored 7 years ago by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

precomp.hpp modules/dnn/src/precomp.hpp +1 -0

THDiskFile.cpp modules/dnn/src/torch/THDiskFile.cpp +0 -3

No files found.
--- 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>

--- 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
 {