diff options
| author | Eike Rathke <erack@redhat.com> | 2017-11-17 11:03:45 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-11-20 19:28:10 +0100 |
| commit | 9206a08ada00e8762c4a634f242bd566028964bb (patch) | |
| tree | eaa317ce6717d44f75c077a6db147b0ebd4994b7 /external/icu/icu4c-59-werror-shadow.patch.1 | |
| parent | a8687041c46b3fe93a76faa0a4a65e7069ef5e9d (diff) | |
Upgrade to ICU 60.1
Change-Id: I6d90f51ee88c4e1005edbaa93d23cfb94cb2acfb
Reviewed-on: https://gerrit.libreoffice.org/44871
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'external/icu/icu4c-59-werror-shadow.patch.1')
| -rw-r--r-- | external/icu/icu4c-59-werror-shadow.patch.1 | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/external/icu/icu4c-59-werror-shadow.patch.1 b/external/icu/icu4c-59-werror-shadow.patch.1 index 2031f80cb908..fb88244aff13 100644 --- a/external/icu/icu4c-59-werror-shadow.patch.1 +++ b/external/icu/icu4c-59-werror-shadow.patch.1 @@ -1,45 +1,3 @@ -diff -ur icu.org/source/common/unicode/char16ptr.h icu/source/common/unicode/char16ptr.h -# https://ssl.icu-project.org/trac/ticket/13176 ---- icu.org/source/common/unicode/char16ptr.h 2017-03-29 06:44:37.000000000 +0200 -+++ icu/source/common/unicode/char16ptr.h 2017-04-24 11:56:47.707572355 +0200 -@@ -107,14 +107,14 @@ - - #ifdef U_ALIASING_BARRIER - --Char16Ptr::Char16Ptr(char16_t *p) : p(p) {} -+Char16Ptr::Char16Ptr(char16_t *p_) : p(p_) {} - #if !U_CHAR16_IS_TYPEDEF --Char16Ptr::Char16Ptr(uint16_t *p) : p(cast(p)) {} -+Char16Ptr::Char16Ptr(uint16_t *p_) : p(cast(p_)) {} - #endif - #if U_SIZEOF_WCHAR_T==2 --Char16Ptr::Char16Ptr(wchar_t *p) : p(cast(p)) {} -+Char16Ptr::Char16Ptr(wchar_t *p_) : p(cast(p_)) {} - #endif --Char16Ptr::Char16Ptr(std::nullptr_t p) : p(p) {} -+Char16Ptr::Char16Ptr(std::nullptr_t p_) : p(p_) {} - Char16Ptr::~Char16Ptr() { - U_ALIASING_BARRIER(p); - } -@@ -215,14 +215,14 @@ - - #ifdef U_ALIASING_BARRIER - --ConstChar16Ptr::ConstChar16Ptr(const char16_t *p) : p(p) {} -+ConstChar16Ptr::ConstChar16Ptr(const char16_t *p_) : p(p_) {} - #if !U_CHAR16_IS_TYPEDEF --ConstChar16Ptr::ConstChar16Ptr(const uint16_t *p) : p(cast(p)) {} -+ConstChar16Ptr::ConstChar16Ptr(const uint16_t *p_) : p(cast(p_)) {} - #endif - #if U_SIZEOF_WCHAR_T==2 --ConstChar16Ptr::ConstChar16Ptr(const wchar_t *p) : p(cast(p)) {} -+ConstChar16Ptr::ConstChar16Ptr(const wchar_t *p_) : p(cast(p_)) {} - #endif --ConstChar16Ptr::ConstChar16Ptr(const std::nullptr_t p) : p(p) {} -+ConstChar16Ptr::ConstChar16Ptr(const std::nullptr_t p_) : p(p_) {} - ConstChar16Ptr::~ConstChar16Ptr() { - U_ALIASING_BARRIER(p); - } diff -ur icu.org/source/common/unicode/unistr.h icu/source/common/unicode/unistr.h --- icu.org/source/common/unicode/unistr.h 2017-03-29 06:44:37.000000000 +0200 +++ icu/source/common/unicode/unistr.h 2017-04-24 11:59:51.782076511 +0200 |