Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
3f5a48bf
Kaydet (Commit)
3f5a48bf
authored
Kas 03, 2013
tarafından
David Tardon
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
fix windows build
Change-Id: I6ee6738fe869fbcd15ec045523c250fd1811e343
üst
56364430
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
70 additions
and
0 deletions
+70
-0
0001-std-isfinite-is-C-11.patch
external/libmwaw/0001-std-isfinite-is-C-11.patch
+64
-0
UnpackedTarball_libmwaw.mk
external/libmwaw/UnpackedTarball_libmwaw.mk
+6
-0
No files found.
external/libmwaw/0001-std-isfinite-is-C-11.patch
0 → 100644
Dosyayı görüntüle @
3f5a48bf
From 5da59d9aa9298136d447e4014aef207f00cdc82b Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sun, 3 Nov 2013 12:26:26 +0100
Subject: [PATCH] std::isfinite is C++11
---
configure.ac | 10 ++++++++++
src/lib/CWDbaseContent.cxx | 5 +++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index b350b91..286939d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -357,6 +357,16 @@ AC_SUBST(ZLIB_CFLAGS)
AC_SUBST(ZLIB_LIBS)
AM_CONDITIONAL([WITH_LIBMWAW_ZIP], [test "x$with_zip" != "xno"])
+# ==================
+# Find boost headers
+# ==================
+AC_CHECK_HEADERS(
+ boost/math/special_functions/fpclassify.hpp,
+ [],
+ [AC_MSG_ERROR([Required boost headers not found.])],
+ []
+)
+
# =============
# Documentation
# =============
diff --git a/src/lib/CWDbaseContent.cxx b/src/lib/CWDbaseContent.cxx
index f27148d..7198103 100644
--- a/src/lib/CWDbaseContent.cxx
+++ b/src/lib/CWDbaseContent.cxx
@@ -33,7 +33,6 @@
#include <time.h>
-#include <cmath>
#include <cstring>
#include <ctime>
#include <iomanip>
@@ -41,6 +40,8 @@
#include <set>
#include <sstream>
+#include <boost/math/special_functions/fpclassify.hpp>
+
#include <libwpd/libwpd.h>
#include "MWAWContentListener.hxx"
@@ -969,7 +970,7 @@ void CWDbaseContent::send(double val, CWStyleManager::CellFormat const &format)
if (type>=10&&type<=11) type += 4;
else if (type>=14) type=16;
}
- if (type <= 0 || type >=16 || type==10 || type==11 || !std::isfinite(val)) {
+ if (type <= 0 || type >=16 || type==10 || type==11 || !boost::math::isfinite(val)) {
s << val;
listener->insertUnicodeString(s.str().c_str());
return;
--
1.8.3.1
external/libmwaw/UnpackedTarball_libmwaw.mk
Dosyayı görüntüle @
3f5a48bf
...
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libmwaw))
...
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libmwaw))
$(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
external/libmwaw/0001-std-isfinite-is-C-11.patch \
))
# vim: set noet sw=4 ts=4:
# vim: set noet sw=4 ts=4:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment