You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
75 lines
2.1 KiB
75 lines
2.1 KiB
8 years ago
|
From: Stephane Mankowski <stephane@mankowski.fr>
|
||
|
Date: Wed, 24 Feb 2016 14:07:00 +0000
|
||
|
Subject: Building the v2.3.0 package on Arch Linux dies with an error 'isnan' was not declared in this scope
|
||
|
X-Git-Url: http://quickgit.kde.org/?p=skrooge.git&a=commitdiff&h=dacb104d4c803679be744c198c70a871c2078dd0
|
||
|
---
|
||
|
Building the v2.3.0 package on Arch Linux dies with an error 'isnan' was not declared in this scope
|
||
|
BUG:359679
|
||
|
---
|
||
|
|
||
|
|
||
|
--- a/plugins/import/skrooge_import_gnc/skgimportplugingnc.cpp
|
||
|
+++ b/plugins/import/skrooge_import_gnc/skgimportplugingnc.cpp
|
||
|
@@ -27,7 +27,6 @@
|
||
|
|
||
|
#include <qdom.h>
|
||
|
#include <qfileinfo.h>
|
||
|
-#include <math.h>
|
||
|
#include <cmath>
|
||
|
|
||
|
#include "skgtraces.h"
|
||
|
@@ -36,11 +35,6 @@
|
||
|
#include "skgobjectbase.h"
|
||
|
#include "skgpayeeobject.h"
|
||
|
#include "skgimportexportmanager.h"
|
||
|
-
|
||
|
-#ifdef Q_OS_WIN
|
||
|
-#define isnan(a) _isnan(a)
|
||
|
-#define isinf(a) !_finite(a)
|
||
|
-#endif
|
||
|
|
||
|
/**
|
||
|
* This plugin factory.
|
||
|
@@ -386,7 +380,7 @@
|
||
|
}
|
||
|
}
|
||
|
|
||
|
- if (!isnan(info.value)) {
|
||
|
+ if (!std::isnan(info.value)) {
|
||
|
QChar accountType = mapIdType[info.account.text()];
|
||
|
if (accountType == 'C') {
|
||
|
suboperationsList.push_front(info);
|
||
|
|
||
|
--- a/skgbasemodeler/skgdocument.cpp
|
||
|
+++ b/skgbasemodeler/skgdocument.cpp
|
||
|
@@ -42,7 +42,6 @@
|
||
|
#include <qurl.h>
|
||
|
|
||
|
#include <sqlite3.h>
|
||
|
-#include <math.h>
|
||
|
#include <cmath>
|
||
|
|
||
|
#include "skgtraces.h"
|
||
|
@@ -51,11 +50,6 @@
|
||
|
#include "skgpropertyobject.h"
|
||
|
#include "skgtransactionmng.h"
|
||
|
#include "skgreport.h"
|
||
|
-
|
||
|
-#ifdef Q_OS_WIN
|
||
|
-#define isnan(a) _isnan(a)
|
||
|
-#define isinf(a) !_finite(a)
|
||
|
-#endif
|
||
|
|
||
|
#ifdef SKGCIPHER
|
||
|
#define SQLDRIVERNAME QStringLiteral("SKGSQLCIPHER")
|
||
|
@@ -2693,7 +2687,7 @@
|
||
|
if (iValue > 0) {
|
||
|
p = '+' % p;
|
||
|
}
|
||
|
- if (p.count() > 10 || isnan(iValue) || isinf(iValue)) {
|
||
|
+ if (p.count() > 10 || std::isnan(iValue) || std::isinf(iValue)) {
|
||
|
p = QChar(8734);
|
||
|
}
|
||
|
return "<font color=\"" %
|
||
|
|