From 2ad612f475830f13e72f57f1576a7038bae171bb Mon Sep 17 00:00:00 2001 From: Rostislav Vasilikhin Date: Wed, 14 Jun 2017 21:00:06 +0300 Subject: [PATCH] removed MSVC warning suppression --- modules/ts/include/opencv2/ts/ts_gtest.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/ts/include/opencv2/ts/ts_gtest.h b/modules/ts/include/opencv2/ts/ts_gtest.h index 556934dced..742cc810b5 100644 --- a/modules/ts/include/opencv2/ts/ts_gtest.h +++ b/modules/ts/include/opencv2/ts/ts_gtest.h @@ -10334,12 +10334,7 @@ class TypeWithoutFormatter { // T is not an enum, printing it as an integer is the best we can do // given that it has no user-defined printer. static void PrintValue(const T& value, ::std::ostream* os) { - // MSVC warns about implicitly converting from double and float to int for - // possible loss of data, so we need to temporarily disable the - // warning. - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4244) - const internal::BiggestInt kBigInt = value; - GTEST_DISABLE_MSC_WARNINGS_POP_() + const internal::BiggestInt kBigInt = static_cast(value); *os << kBigInt; } };