1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QLocale: use fenv everywhere

Browse Source 
And remove the platform-specific code.
fenv is available since c++11.

Change-Id: Ia5540be93b54117d4b5e9c7579100039c151dcc5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Mårten Nordheim 2022-09-12 13:23:48 +02:00
parent 59e08d2105
commit 7447d73327
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/auto/corelib/text/qlocale/tst_qlocale.cpp
View File

@ -23,11 +23,7 @@
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>
#include <fenv.h>
#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
# include <fenv.h>
# define QT_USE_FENV
#endif
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
# include <stdlib.h> # include <stdlib.h>
@ -1487,25 +1483,12 @@ void tst_QLocale::infNaN()
void tst_QLocale::fpExceptions() void tst_QLocale::fpExceptions()
{ {
#if defined(FE_ALL_EXCEPT) && FE_ALL_EXCEPT != 0
// Check that double-to-string conversion doesn't throw floating point // Check that double-to-string conversion doesn't throw floating point
// exceptions when they are enabled. // exceptions when they are enabled.
#ifdef Q_OS_WIN
# ifndef _MCW_EM
# define _MCW_EM 0x0008001F
# endif
# ifndef _EM_INEXACT
# define _EM_INEXACT 0x00000001
# endif
_clearfp();
unsigned int oldbits = _controlfp(0 | _EM_INEXACT, _MCW_EM);
#endif
#ifdef QT_USE_FENV
fenv_t envp; fenv_t envp;
fegetenv(&envp); fegetenv(&envp);
feclearexcept(FE_ALL_EXCEPT); feclearexcept(FE_ALL_EXCEPT);
feenableexcept(FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INVALID);
#endif
QString::number(1000.1245); QString::number(1000.1245);
QString::number(1.1); QString::number(1.1);
@ -1513,12 +1496,7 @@ void tst_QLocale::fpExceptions()
QVERIFY(true); QVERIFY(true);
#ifdef Q_OS_WIN QCOMPARE(fetestexcept(FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INVALID), 0);
_clearfp();
_controlfp(oldbits, _MCW_EM);
#endif
#ifdef QT_USE_FENV
fesetenv(&envp); fesetenv(&envp);
#endif #endif
} }