From: StevenPuttemans Date: Wed, 27 Jul 2016 09:21:08 +0000 (+0200) Subject: fix build #6993 X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1714^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=64dbf6c987f8197406020ef1defc7a46f78fb73f;p=platform%2Fupstream%2Fopencv.git fix build #6993 --- diff --git a/modules/cudalegacy/test/TestHaarCascadeApplication.cpp b/modules/cudalegacy/test/TestHaarCascadeApplication.cpp index 603f109..adc3dff 100644 --- a/modules/cudalegacy/test/TestHaarCascadeApplication.cpp +++ b/modules/cudalegacy/test/TestHaarCascadeApplication.cpp @@ -52,8 +52,7 @@ namespace ~FpuControl(); private: - #if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) && - !defined(__aarch64__) && !defined(__powerpc64__) + #if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__powerpc64__) fpu_control_t fpu_oldcw, fpu_cw; #elif defined(_WIN32) && !defined(_WIN64) unsigned int fpu_oldcw, fpu_cw; @@ -62,8 +61,7 @@ namespace FpuControl::FpuControl() { - #if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) && - !defined(__aarch64__) && !defined(__powerpc64__) + #if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__powerpc64__) _FPU_GETCW(fpu_oldcw); fpu_cw = (fpu_oldcw & ~_FPU_EXTENDED & ~_FPU_DOUBLE & ~_FPU_SINGLE) | _FPU_SINGLE; _FPU_SETCW(fpu_cw); @@ -76,8 +74,7 @@ namespace FpuControl::~FpuControl() { - #if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) && - !defined(__aarch64__) && !defined(__powerpc64__) + #if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__powerpc64__) _FPU_SETCW(fpu_oldcw); #elif defined(_WIN32) && !defined(_WIN64) _controlfp_s(&fpu_cw, fpu_oldcw, _MCW_PC); diff --git a/modules/cudalegacy/test/test_precomp.hpp b/modules/cudalegacy/test/test_precomp.hpp index eeebb74..5e0e9ee 100644 --- a/modules/cudalegacy/test/test_precomp.hpp +++ b/modules/cudalegacy/test/test_precomp.hpp @@ -51,8 +51,7 @@ #ifndef __OPENCV_TEST_PRECOMP_HPP__ #define __OPENCV_TEST_PRECOMP_HPP__ -#if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) && - !defined(__aarch64__) && !defined(__powerpc64__) +#if defined(__GNUC__) && !defined(__APPLE__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__powerpc64__) #include #endif