diff options
| author | Eike Rathke <erack@redhat.com> | 2016-11-02 13:07:48 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-11-02 18:42:47 +0000 |
| commit | 3e42714c76b1347babfdea0564009d8d82a83af4 (patch) | |
| tree | fc41d8b3e42253c7bb34533a59d9bfc7908b6292 /external | |
| parent | b68ed302830fd1c44212eeb6c23d5a08b7dc97ec (diff) | |
upgrade to ICU 58
Change-Id: I4a992447df65b337721a2a2627d974172a14cba5
Reviewed-on: https://gerrit.libreoffice.org/30487
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/icu/icu-ubsan.patch.0 | 11 | ||||
| -rw-r--r-- | external/icu/icu4c-warnings.patch | 12 |
2 files changed, 0 insertions, 23 deletions
diff --git a/external/icu/icu-ubsan.patch.0 b/external/icu/icu-ubsan.patch.0 index 6d1d3bcf5014..8a47242117c5 100644 --- a/external/icu/icu-ubsan.patch.0 +++ b/external/icu/icu-ubsan.patch.0 @@ -151,14 +151,3 @@ length(len), next(subNode) {} virtual UBool operator==(const Node &other) const; virtual int32_t markRightEdgesFirst(int32_t edgeNumber); ---- source/common/unifiedcache.h -+++ source/common/unifiedcache.h -@@ -139,7 +139,7 @@ - : CacheKey<T>(other), fLoc(other.fLoc) { } - virtual ~LocaleCacheKey() { } - virtual int32_t hashCode() const { -- return 37 *CacheKey<T>::hashCode() + fLoc.hashCode(); -+ return 37U *CacheKey<T>::hashCode() + fLoc.hashCode(); - } - virtual UBool operator == (const CacheKeyBase &other) const { - // reflexive diff --git a/external/icu/icu4c-warnings.patch b/external/icu/icu4c-warnings.patch index d1460933857f..96608d7d1ef3 100644 --- a/external/icu/icu4c-warnings.patch +++ b/external/icu/icu4c-warnings.patch @@ -8,15 +8,3 @@ } \ } ---- misc/icu/source/common/unicode/utypes.h -+++ misc/build/icu/source/common/unicode/utypes.h -@@ -399,7 +399,7 @@ - * some Linux/Unix compilers have problems with defining global new/delete. - * On Windows, it is _MSC_VER>=1200 for MSVC 6.0 and higher. - */ --#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && (_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && (defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || defined(U_LAYOUTEX_IMPLEMENTATION)) -+#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && defined (_MSC_VER) && (_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && (defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || defined(U_LAYOUTEX_IMPLEMENTATION)) - - #ifndef U_HIDE_INTERNAL_API - /** - |