skrooge-gcc-fix.patch 1.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364
  1. --- a/skgbasemodeler/skgdocument.cpp
  2. +++ b/skgbasemodeler/skgdocument.cpp
  3. @@ -42,7 +42,6 @@
  4. #include <qurl.h>
  5. #include <sqlite3.h>
  6. -#include <math.h>
  7. #include <cmath>
  8. #include "skgtraces.h"
  9. @@ -51,11 +50,6 @@
  10. #include "skgpropertyobject.h"
  11. #include "skgtransactionmng.h"
  12. #include "skgreport.h"
  13. -
  14. -#ifdef Q_OS_WIN
  15. -#define isnan(a) _isnan(a)
  16. -#define isinf(a) !_finite(a)
  17. -#endif
  18. #ifdef SKGCIPHER
  19. #define SQLDRIVERNAME QStringLiteral("SKGSQLCIPHER")
  20. @@ -2693,7 +2687,7 @@
  21. if (iValue > 0) {
  22. p = '+' % p;
  23. }
  24. - if (p.count() > 10 || isnan(iValue) || isinf(iValue)) {
  25. + if (p.count() > 10 || std::isnan(iValue) || std::isinf(iValue)) {
  26. p = QChar(8734);
  27. }
  28. return "<font color=\"" %
  29. --- a/plugins/import/skrooge_import_gnc/skgimportplugingnc.cpp
  30. +++ b/plugins/import/skrooge_import_gnc/skgimportplugingnc.cpp
  31. @@ -27,7 +27,6 @@
  32. #include <qdom.h>
  33. #include <qfileinfo.h>
  34. -#include <math.h>
  35. #include <cmath>
  36. #include "skgtraces.h"
  37. @@ -36,11 +35,6 @@
  38. #include "skgobjectbase.h"
  39. #include "skgpayeeobject.h"
  40. #include "skgimportexportmanager.h"
  41. -
  42. -#ifdef Q_OS_WIN
  43. -#define isnan(a) _isnan(a)
  44. -#define isinf(a) !_finite(a)
  45. -#endif
  46. /**
  47. * This plugin factory.
  48. @@ -386,7 +380,7 @@
  49. }
  50. }
  51. - if (!isnan(info.value)) {
  52. + if (!std::isnan(info.value)) {
  53. QChar accountType = mapIdType[info.account.text()];
  54. if (accountType == 'C') {
  55. suboperationsList.push_front(info);