| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 698a0e104dcbe4b630df848fd4af7c59f76cdc37 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 5 May 2018 17:46:52 -0700 |
| 4 | Subject: [PATCH] Use recommended way to handle the icu namespace |
| 5 | |
| 6 | Fixes build with icu >= 61 |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | src/libedataserver/e-alphabet-index-private.cpp | 2 ++ |
| 13 | src/libedataserver/e-transliterator-private.cpp | 2 ++ |
| 14 | 2 files changed, 4 insertions(+) |
| 15 | |
| 16 | diff --git a/src/libedataserver/e-alphabet-index-private.cpp b/src/libedataserver/e-alphabet-index-private.cpp |
| 17 | index d3e44f4..ddffd99 100644 |
| 18 | --- a/src/libedataserver/e-alphabet-index-private.cpp |
| 19 | +++ b/src/libedataserver/e-alphabet-index-private.cpp |
| 20 | @@ -33,9 +33,11 @@ |
| 21 | |
| 22 | /* ICU headers */ |
| 23 | #include <unicode/alphaindex.h> |
| 24 | +#include <unicode/ustring.h> |
| 25 | |
| 26 | using icu::AlphabeticIndex; |
| 27 | using icu::Locale; |
| 28 | +using U_ICU_NAMESPACE::UnicodeString; |
| 29 | |
| 30 | struct _EAlphabetIndex { |
| 31 | AlphabeticIndex *priv; |
| 32 | diff --git a/src/libedataserver/e-transliterator-private.cpp b/src/libedataserver/e-transliterator-private.cpp |
| 33 | index bb15593..573446f 100644 |
| 34 | --- a/src/libedataserver/e-transliterator-private.cpp |
| 35 | +++ b/src/libedataserver/e-transliterator-private.cpp |
| 36 | @@ -33,8 +33,10 @@ |
| 37 | |
| 38 | /* ICU headers */ |
| 39 | #include <unicode/translit.h> |
| 40 | +#include <unicode/ustring.h> |
| 41 | |
| 42 | using icu::Transliterator; |
| 43 | +using U_ICU_NAMESPACE::UnicodeString; |
| 44 | |
| 45 | struct _ETransliterator { |
| 46 | Transliterator *priv; |