patches/remove_si.patch - Issue 1823293002: Update timezone and apply miscellaneous locale data fixes

Side by Side Diff: patches/remove_si.patch

Issue 1823293002: Update timezone and apply miscellaneous locale data fixes (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master

Patch Set: fix a typo in README.chromium Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 diff --git a/patches/remove_si.patch b/patches/remove_si.patch

2 index d21d996..e69de29 100644

3 --- a/patches/remove_si.patch

4 +++ b/patches/remove_si.patch

5 @@ -1,32 +0,0 @@

6 -diff --git a/source/i18n/region.cpp b/source/i18n/region.cpp

7 -index 085f704..b5a1ae2 100644

8 ---- a/source/i18n/region.cpp

9 -+++ b/source/i18n/region.cpp

10 -@@ -67,8 +67,7 @@ static UVector *allRegions = NULL;

11 - static const UChar UNKNOWN_REGION_ID [] = { 0x5A, 0x5A, 0 }; /* "ZZ" */

12 - static const UChar OUTLYING_OCEANIA_REGION_ID [] = { 0x51, 0x4F, 0 }; /* "QO" */

13 - static const UChar WORLD_ID [] = { 0x30, 0x30, 0x31, 0 }; /* "001" */

14 --static const UChar RANGE_MARKER [] = { 0x7e, 0 }; /* "~" */

15 --static const UnicodeString RANGE_MARKER_STRING(RANGE_MARKER);

16 -+static const UChar RANGE_MARKER 0x7eu; /* '~' */

17 -

18 - UOBJECT_DEFINE_RTTI_IMPLEMENTATION(RegionNameEnumeration)

19 -

20 -@@ -121,7 +120,7 @@ void Region::loadRegionData(UErrorCode &status) {

21 -

22 - while ( ures_hasNext(regionRegular.getAlias()) ) {

23 - UnicodeString regionName = ures_getNextUnicodeString(regionRegular.get Alias(),NULL,&status);

24 -- int32_t rangeMarkerLocation = regionName.indexOf(RANGE_MARKER_STRING);

25 -+ int32_t rangeMarkerLocation = regionName.indexOf(RANGE_MARKER);

26 - UChar buf[6];

27 - regionName.extract(buf,6,status);

28 - if ( rangeMarkerLocation > 0 ) {

29 -@@ -140,7 +139,7 @@ void Region::loadRegionData(UErrorCode &status) {

30 -

31 - while ( ures_hasNext(regionMacro.getAlias()) ) {

32 - UnicodeString regionName = ures_getNextUnicodeString(regionMacro.getAl ias(),NULL,&status);

33 -- int32_t rangeMarkerLocation = regionName.indexOf(RANGE_MARKER_STRING);

34 -+ int32_t rangeMarkerLocation = regionName.indexOf(RANGE_MARKER);

35 - UChar buf[6];

36 - regionName.extract(buf,6,status);

37 - if ( rangeMarkerLocation > 0 ) {

38 diff --git a/source/i18n/region.cpp b/source/i18n/region.cpp	1 diff --git a/source/i18n/region.cpp b/source/i18n/region.cpp

39 index 085f704..15c5dd0 100644	2 index 085f704..15c5dd0 100644

40 --- a/source/i18n/region.cpp	3 --- a/source/i18n/region.cpp

41 +++ b/source/i18n/region.cpp	4 +++ b/source/i18n/region.cpp

42 @@ -67,8 +67,7 @@ static UVector *allRegions = NULL;	5 @@ -67,8 +67,7 @@ static UVector *allRegions = NULL;

43 static const UChar UNKNOWN_REGION_ID [] = { 0x5A, 0x5A, 0 }; /* "ZZ" */	6 static const UChar UNKNOWN_REGION_ID [] = { 0x5A, 0x5A, 0 }; /* "ZZ" */

44 static const UChar OUTLYING_OCEANIA_REGION_ID [] = { 0x51, 0x4F, 0 }; /* "QO" */	7 static const UChar OUTLYING_OCEANIA_REGION_ID [] = { 0x51, 0x4F, 0 }; /* "QO" */

45 static const UChar WORLD_ID [] = { 0x30, 0x30, 0x31, 0 }; /* "001" */	8 static const UChar WORLD_ID [] = { 0x30, 0x30, 0x31, 0 }; /* "001" */

46 -static const UChar RANGE_MARKER [] = { 0x7e, 0 }; /* "~" */	9 -static const UChar RANGE_MARKER [] = { 0x7e, 0 }; /* "~" */

47 -static const UnicodeString RANGE_MARKER_STRING(RANGE_MARKER);	10 -static const UnicodeString RANGE_MARKER_STRING(RANGE_MARKER);

(...skipping 12 matching lines...) Expand all Loading...
60 if ( rangeMarkerLocation > 0 ) {	23 if ( rangeMarkerLocation > 0 ) {

61 @@ -140,7 +139,7 @@ void Region::loadRegionData(UErrorCode &status) {	24 @@ -140,7 +139,7 @@ void Region::loadRegionData(UErrorCode &status) {

62	25

63 while ( ures_hasNext(regionMacro.getAlias()) ) {	26 while ( ures_hasNext(regionMacro.getAlias()) ) {

64 UnicodeString regionName = ures_getNextUnicodeString(regionMacro.getAli as(),NULL,&status);	27 UnicodeString regionName = ures_getNextUnicodeString(regionMacro.getAli as(),NULL,&status);

65 - int32_t rangeMarkerLocation = regionName.indexOf(RANGE_MARKER_STRING);	28 - int32_t rangeMarkerLocation = regionName.indexOf(RANGE_MARKER_STRING);

66 + int32_t rangeMarkerLocation = regionName.indexOf(RANGE_MARKER);	29 + int32_t rangeMarkerLocation = regionName.indexOf(RANGE_MARKER);

67 UChar buf[6];	30 UChar buf[6];

68 regionName.extract(buf,6,status);	31 regionName.extract(buf,6,status);

69 if ( rangeMarkerLocation > 0 ) {	32 if ( rangeMarkerLocation > 0 ) {

OLD	NEW

« no previous file with comments | « patches/locale_google.patch ('k') | scripts/copy_data.sh » ('j') | no next file with comments »