From 8755e557a7398cbcb805791967a89d766d8f7537 Mon Sep 17 00:00:00 2001 From: Lukasz Pik Date: Wed, 7 Nov 2018 14:06:39 +0100 Subject: [PATCH] Fix errors caused by ICU 63 Change-Id: I4afc3db0105e25fae8f7a546f098de289f7b1fcc Signed-off-by: Lukasz Pik --- src/utils_i18n_alpha_idx.cpp | 4 ++++ src/utils_i18n_date_interval.cpp | 2 ++ src/utils_i18n_date_interval_format.cpp | 8 ++++++++ src/utils_i18n_field_position.cpp | 2 ++ src/utils_i18n_format.cpp | 7 +++++++ src/utils_i18n_formattable.cpp | 3 +++ src/utils_i18n_immutable_idx.cpp | 3 +++ src/utils_i18n_loc_disp_names.cpp | 4 ++++ src/utils_i18n_measure.cpp | 4 ++++ src/utils_i18n_measure_format.cpp | 9 +++++++++ src/utils_i18n_measure_unit.cpp | 4 +++- src/utils_i18n_parse_position.cpp | 2 ++ src/utils_i18n_plural_format.cpp | 8 ++++++++ src/utils_i18n_plural_rules.cpp | 5 +++++ src/utils_i18n_simple_date_format.cpp | 7 ++++++- src/utils_i18n_timezone.cpp | 5 +++++ src/utils_i18n_ulocale.cpp | 2 ++ 17 files changed, 77 insertions(+), 2 deletions(-) diff --git a/src/utils_i18n_alpha_idx.cpp b/src/utils_i18n_alpha_idx.cpp index 734225d..f399863 100644 --- a/src/utils_i18n_alpha_idx.cpp +++ b/src/utils_i18n_alpha_idx.cpp @@ -22,6 +22,10 @@ #include #include +using icu::AlphabeticIndex; +using icu::Locale; +using icu::UnicodeString; + int i18n_alpha_idx_create(const char *language, const char *country, i18n_alpha_idx_h *index) { diff --git a/src/utils_i18n_date_interval.cpp b/src/utils_i18n_date_interval.cpp index 0b18be1..b1cdf50 100644 --- a/src/utils_i18n_date_interval.cpp +++ b/src/utils_i18n_date_interval.cpp @@ -19,6 +19,8 @@ #include +using icu::DateInterval; + int i18n_date_interval_create(i18n_udate from_date, i18n_udate to_date, i18n_date_interval_h *date_interval) { retv_if(date_interval == NULL, I18N_ERROR_INVALID_PARAMETER); diff --git a/src/utils_i18n_date_interval_format.cpp b/src/utils_i18n_date_interval_format.cpp index a665546..35cff1c 100644 --- a/src/utils_i18n_date_interval_format.cpp +++ b/src/utils_i18n_date_interval_format.cpp @@ -22,6 +22,14 @@ #include #include +using icu::UnicodeString; +using icu::Locale; +using icu::TimeZone; +using icu::Calendar; +using icu::FieldPosition; +using icu::DateInterval; +using icu::DateIntervalFormat; + int i18n_date_interval_fmt_create(const char *skeleton, i18n_date_interval_fmt_h *date_interval_fmt) { retv_if(date_interval_fmt == NULL, I18N_ERROR_INVALID_PARAMETER); diff --git a/src/utils_i18n_field_position.cpp b/src/utils_i18n_field_position.cpp index 8c4c9d7..704b6ba 100644 --- a/src/utils_i18n_field_position.cpp +++ b/src/utils_i18n_field_position.cpp @@ -19,6 +19,8 @@ #include +using icu::FieldPosition; + int i18n_field_position_create(i18n_field_position_h *field_position) { retv_if(field_position == NULL, I18N_ERROR_INVALID_PARAMETER); diff --git a/src/utils_i18n_format.cpp b/src/utils_i18n_format.cpp index 9953e5e..a16a4b9 100644 --- a/src/utils_i18n_format.cpp +++ b/src/utils_i18n_format.cpp @@ -21,6 +21,13 @@ #include #include +using icu::UnicodeString; +using icu::Locale; +using icu::Formattable; +using icu::FieldPosition; +using icu::ParsePosition; +using icu::Format; + int i18n_format_destroy(i18n_format_h format) { retv_if(format == NULL, I18N_ERROR_INVALID_PARAMETER); diff --git a/src/utils_i18n_formattable.cpp b/src/utils_i18n_formattable.cpp index 968a8e7..a767c6e 100644 --- a/src/utils_i18n_formattable.cpp +++ b/src/utils_i18n_formattable.cpp @@ -21,6 +21,9 @@ #include #include +using icu::UnicodeString; +using icu::Formattable; + int i18n_formattable_create_default(i18n_formattable_h *formattable) { retv_if(formattable == NULL, I18N_ERROR_INVALID_PARAMETER); diff --git a/src/utils_i18n_immutable_idx.cpp b/src/utils_i18n_immutable_idx.cpp index 0d24e92..4ccca44 100644 --- a/src/utils_i18n_immutable_idx.cpp +++ b/src/utils_i18n_immutable_idx.cpp @@ -21,6 +21,9 @@ #include #include +using icu::AlphabeticIndex; +using icu::UnicodeString; + int i18n_immutable_idx_create(i18n_alpha_idx_h index, i18n_immutable_idx_h *immutable_index) { retv_if(index == NULL, I18N_ERROR_INVALID_PARAMETER); diff --git a/src/utils_i18n_loc_disp_names.cpp b/src/utils_i18n_loc_disp_names.cpp index f03cd2e..7f11c13 100644 --- a/src/utils_i18n_loc_disp_names.cpp +++ b/src/utils_i18n_loc_disp_names.cpp @@ -20,6 +20,10 @@ #include +using icu::Locale; +using icu::UnicodeString; +using icu::LocaleDisplayNames; + int i18n_loc_disp_names_create(const char *locale, i18n_loc_disp_names_h *loc_disp_names) { retv_if(loc_disp_names == NULL, I18N_ERROR_INVALID_PARAMETER); diff --git a/src/utils_i18n_measure.cpp b/src/utils_i18n_measure.cpp index 037b864..58f95a5 100644 --- a/src/utils_i18n_measure.cpp +++ b/src/utils_i18n_measure.cpp @@ -20,6 +20,10 @@ #include #include +using icu::Formattable; +using icu::MeasureUnit; +using icu::Measure; + int i18n_measure_create(const i18n_formattable_h formattable, i18n_measure_unit_h measure_unit, i18n_measure_h *measure) { retv_if(measure == NULL || formattable == NULL || measure_unit == NULL, I18N_ERROR_INVALID_PARAMETER); diff --git a/src/utils_i18n_measure_format.cpp b/src/utils_i18n_measure_format.cpp index 70cd9cb..1b0e1f2 100644 --- a/src/utils_i18n_measure_format.cpp +++ b/src/utils_i18n_measure_format.cpp @@ -23,6 +23,15 @@ #include #include +using icu::Locale; +using icu::UnicodeString; +using icu::Measure; +using icu::Formattable; +using icu::FieldPosition; +using icu::ParsePosition; +using icu::MeasureUnit; +using icu::MeasureFormat; + int i18n_measure_format_create(const char *language, const char *country, i18n_umeasure_format_width_e width, diff --git a/src/utils_i18n_measure_unit.cpp b/src/utils_i18n_measure_unit.cpp index f316261..7c26d4f 100644 --- a/src/utils_i18n_measure_unit.cpp +++ b/src/utils_i18n_measure_unit.cpp @@ -21,6 +21,9 @@ #include #include +using icu::StringEnumeration; +using icu::MeasureUnit; + int i18n_measure_unit_create(i18n_measure_unit_h *measure_unit) { retv_if(measure_unit == NULL, I18N_ERROR_INVALID_PARAMETER); @@ -1509,4 +1512,3 @@ int i18n_measure_unit_create_teaspoon(i18n_measure_unit_h *measure_unit) return _i18n_error_mapping(status); } - diff --git a/src/utils_i18n_parse_position.cpp b/src/utils_i18n_parse_position.cpp index ef49867..0bf8a33 100644 --- a/src/utils_i18n_parse_position.cpp +++ b/src/utils_i18n_parse_position.cpp @@ -19,6 +19,8 @@ #include +using icu::ParsePosition; + int i18n_parse_position_create(i18n_parse_position_h *parse_position) { retv_if(parse_position == NULL, I18N_ERROR_INVALID_PARAMETER); diff --git a/src/utils_i18n_plural_format.cpp b/src/utils_i18n_plural_format.cpp index c109a2d..9515af2 100644 --- a/src/utils_i18n_plural_format.cpp +++ b/src/utils_i18n_plural_format.cpp @@ -21,6 +21,14 @@ #include #include +using icu::Locale; +using icu::UnicodeString; +using icu::FieldPosition; +using icu::Formattable; +using icu::NumberFormat; +using icu::PluralRules; +using icu::PluralFormat; + int i18n_plural_format_create(i18n_plural_format_h *plural_format) { retv_if(plural_format == NULL, I18N_ERROR_INVALID_PARAMETER); diff --git a/src/utils_i18n_plural_rules.cpp b/src/utils_i18n_plural_rules.cpp index 6ce4612..08cee57 100644 --- a/src/utils_i18n_plural_rules.cpp +++ b/src/utils_i18n_plural_rules.cpp @@ -20,6 +20,11 @@ #include +using icu::Locale; +using icu::StringEnumeration; +using icu::UnicodeString; +using icu::PluralRules; + int i18n_plural_rules_create(i18n_plural_rules_h *plural_rules) { retv_if(plural_rules == NULL, I18N_ERROR_INVALID_PARAMETER); diff --git a/src/utils_i18n_simple_date_format.cpp b/src/utils_i18n_simple_date_format.cpp index 372a6d4..ed97fb6 100644 --- a/src/utils_i18n_simple_date_format.cpp +++ b/src/utils_i18n_simple_date_format.cpp @@ -20,6 +20,12 @@ #include +using icu::UnicodeString; +using icu::Locale; +using icu::Calendar; +using icu::FieldPosition; +using icu::ParsePosition; +using icu::SimpleDateFormat; int i18n_simple_date_fmt_create(i18n_simple_date_fmt_h *simple_date_fmt) { @@ -354,4 +360,3 @@ int i18n_simple_date_fmt_set_context(i18n_simple_date_fmt_h simple_date_fmt, return _i18n_error_mapping(status); } - diff --git a/src/utils_i18n_timezone.cpp b/src/utils_i18n_timezone.cpp index 99f992e..9242d31 100755 --- a/src/utils_i18n_timezone.cpp +++ b/src/utils_i18n_timezone.cpp @@ -31,6 +31,11 @@ #include #include +using icu::UnicodeString; +using icu::StringEnumeration; +using icu::Locale; +using icu::TimeZone; + int i18n_timezone_create_unknown(i18n_timezone_h *timezone) { retv_if(timezone == NULL, I18N_ERROR_INVALID_PARAMETER); diff --git a/src/utils_i18n_ulocale.cpp b/src/utils_i18n_ulocale.cpp index a7fdaf2..0eee156 100644 --- a/src/utils_i18n_ulocale.cpp +++ b/src/utils_i18n_ulocale.cpp @@ -19,6 +19,8 @@ #include #include +using icu::Locale; + int i18n_ulocale_get_default(const char **locale) { retv_if(locale == NULL, I18N_ERROR_INVALID_PARAMETER); -- 2.7.4