patches/remove_si.patch - Issue 2442923002: ICU update to 58 part 2

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: patches/remove_si.patch

Issue 2442923002: ICU update to 58 part 2 (Closed)

Patch Set: apply more patches and updates; almost ready to roll Created 4 years, 1 month 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
	(Empty)
1 diff --git a/source/i18n/region.cpp b/source/i18n/region.cpp

2 index 085f704..15c5dd0 100644

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

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

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

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

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

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

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

10 -static const UnicodeString RANGE_MARKER_STRING(RANGE_MARKER);

11 +static const UChar RANGE_MARKER = 0x7eu; /* '~' */

12

13 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(RegionNameEnumeration)

14

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

16

17 while ( ures_hasNext(regionRegular.getAlias()) ) {

18 UnicodeString regionName = ures_getNextUnicodeString(regionRegular.getA lias(),NULL,&status);

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

20 + int32_t rangeMarkerLocation = regionName.indexOf(RANGE_MARKER);

21 UChar buf[6];

22 regionName.extract(buf,6,status);

23 if ( rangeMarkerLocation > 0 ) {

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

25

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

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

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

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

30 UChar buf[6];

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

32 if ( rangeMarkerLocation > 0 ) {

OLD	NEW

« no previous file with comments | « patches/relative_date.patch ('k') | patches/scriptset.patch » ('j') | no next file with comments »