Skip to content
/ icu Public

Commit 261de78

Browse files
mihnitamihnita
authored
Merge branch 'maint/maint-78' into ICU-23290-CLDR-48-1-beta1-to-ICU-maint-78-branch
2 parents 206b52f + b66f1df commit 261de78

File tree

29 files changed

+61
-45
lines changed

29 files changed

+61
-45
lines changed

‎icu4c/source/common/unicode/unistr.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4173,8 +4173,10 @@ operator+ (const UnicodeString &s1, const UnicodeString &s2);
41734173
* @return UnicodeString(s1).append(s2)
41744174
* @stable ICU 76
41754175
*/
4176-
template<typename S, typename = std::enable_if_t<ConvertibleToU16StringView<S>>>
4177-
inline UnicodeString operator+(const UnicodeString &s1, const S &s2) {
4176+
template<
4177+
typename US, typename S,
4178+
typename = std::enable_if_t<ConvertibleToU16StringView<S> && std::is_same_v<US, UnicodeString>>>
4179+
inline UnicodeString operator+(const US &s1, const S &s2) {
41784180
return unistr_internalConcat(s1, internal::toU16StringView(s2));
41794181
}
41804182

‎icu4c/source/common/unicode/uvernum.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
* This value will change in the subsequent releases of ICU
6060
* @stable ICU 2.6
6161
*/
62-
#define U_ICU_VERSION_MINOR_NUM 1
62+
#define U_ICU_VERSION_MINOR_NUM 2
6363

6464
/** The current ICU patchlevel version as an integer.
6565
* This value will change in the subsequent releases of ICU
@@ -132,7 +132,7 @@
132132
* This value will change in the subsequent releases of ICU
133133
* @stable ICU 2.4
134134
*/
135-
#define U_ICU_VERSION "78.1"
135+
#define U_ICU_VERSION "78.2"
136136

137137
/**
138138
* The current ICU library major version number as a string, for library name suffixes.
@@ -151,7 +151,7 @@
151151
/** Data version in ICU4C.
152152
* @internal ICU 4.4 Internal Use Only
153153
**/
154-
#define U_ICU_DATA_VERSION "78.1"
154+
#define U_ICU_DATA_VERSION "78.2"
155155
#endif /* U_HIDE_INTERNAL_API */
156156

157157
/*===========================================================================

‎icu4c/source/configure‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.72 for ICU 78.1.
3+
# Generated by GNU Autoconf 2.72 for ICU 78.2.
44
#
55
# Report bugs to <https://icu.unicode.org/bugs>.
66
#
@@ -606,8 +606,8 @@ MAKEFLAGS=
606606
# Identity of this package.
607607
PACKAGE_NAME='ICU'
608608
PACKAGE_TARNAME='icu4c'
609-
PACKAGE_VERSION='78.1'
610-
PACKAGE_STRING='ICU 78.1'
609+
PACKAGE_VERSION='78.2'
610+
PACKAGE_STRING='ICU 78.2'
611611
PACKAGE_BUGREPORT='https://icu.unicode.org/bugs'
612612
PACKAGE_URL='https://icu.unicode.org/'
613613

@@ -1384,7 +1384,7 @@ if test "$ac_init_help" = "long"; then
13841384
# Omit some internal or obsolete options to make the list less imposing.
13851385
# This message is too long to be a string in the A/UX 3.1 sh.
13861386
cat <<_ACEOF
1387-
'configure' configures ICU 78.1 to adapt to many kinds of systems.
1387+
'configure' configures ICU 78.2 to adapt to many kinds of systems.
13881388
13891389
Usage: $0 [OPTION]... [VAR=VALUE]...
13901390
@@ -1450,7 +1450,7 @@ fi
14501450

14511451
if test -n "$ac_init_help"; then
14521452
case $ac_init_help in
1453-
short | recursive ) echo "Configuration of ICU 78.1:";;
1453+
short | recursive ) echo "Configuration of ICU 78.2:";;
14541454
esac
14551455
cat <<\_ACEOF
14561456
@@ -1589,7 +1589,7 @@ fi
15891589
test -n "$ac_init_help" && exit $ac_status
15901590
if $ac_init_version; then
15911591
cat <<\_ACEOF
1592-
ICU configure 78.1
1592+
ICU configure 78.2
15931593
generated by GNU Autoconf 2.72
15941594
15951595
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2133,7 +2133,7 @@ cat >config.log <<_ACEOF
21332133
This file contains any messages produced by compilers while
21342134
running configure, to aid debugging if configure makes a mistake.
21352135
2136-
It was created by ICU $as_me 78.1, which was
2136+
It was created by ICU $as_me 78.2, which was
21372137
generated by GNU Autoconf 2.72. Invocation command line was
21382138
21392139
$ $0$ac_configure_args_raw
@@ -8837,7 +8837,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
88378837
# report actual input values of CONFIG_FILES etc. instead of their
88388838
# values after options handling.
88398839
ac_log="
8840-
This file was extended by ICU $as_me 78.1, which was
8840+
This file was extended by ICU $as_me 78.2, which was
88418841
generated by GNU Autoconf 2.72. Invocation command line was
88428842
88438843
CONFIG_FILES = $CONFIG_FILES
@@ -8893,7 +8893,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
88938893
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
88948894
ac_cs_config='$ac_cs_config_escaped'
88958895
ac_cs_version="\\
8896-
ICU config.status 78.1
8896+
ICU config.status 78.2
88978897
configured by $0, generated by GNU Autoconf 2.72,
88988898
with options \\"\$ac_cs_config\\"
88998899

‎icu4c/source/data/misc/icuver.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
// ***************************************************************************
1010
icuver:table(nofallback){
1111
CLDRVersion{"48"}
12-
DataVersion{"78.1.0.0"}
13-
ICUVersion{"78.1.0.0"}
12+
DataVersion{"78.2.0.0"}
13+
ICUVersion{"78.2.0.0"}
1414
}

‎icu4c/source/data/misc/zoneinfo64.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
// License & terms of use: http://www.unicode.org/copyright.html
44
//---------------------------------------------------------
55
// Build tool: tz2icu
6-
// Build date: Wed Apr 9 14:46:22 2025
6+
// Build date: Mon Dec 15 22:36:35 2025
77
// tz database: ftp://ftp.iana.org/tz/
8-
// tz version: 2025b
9-
// ICU version: 78.0.1
8+
// tz version: 2025c
9+
// ICU version: 78.1
1010
//---------------------------------------------------------
1111
// >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! <<
1212
// >> !!! >>> DO NOT EDIT <<< !!! <<
1313
//---------------------------------------------------------
1414

1515
zoneinfo64:table(nofallback) {
16-
TZVersion { "2025b" }
16+
TZVersion { "2025c" }
1717
Zones:array {
1818
/* ACT */ :int { 358 } //Z#0
1919
/* AET */ :int { 370 } //Z#1
@@ -1024,9 +1024,9 @@ zoneinfo64:table(nofallback) {
10241024
} //Z#217
10251025
/* America/Thunder_Bay */ :int { 220 } //Z#218
10261026
/* America/Tijuana */ :table {
1027-
trans:intvector { -1514739600, -1451667600, -1343145600, -1234803600, -1222963200, -1207242000, -873820800, -761418000, -686073600, -661539600, -620755200, -608144400, -589384800, -576082800, -557935200, -544633200, -495039600, -481734000, -463590000, -450284400, -431535600, -418230000, -400086000, -386780400, -368636400, -355330800, -337186800, -323881200, -305737200, -292431600, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309949200, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 452080800, 467802000, 483530400, 499251600, 514980000, 530701200, 544615200, 562150800, 576064800, 594205200, 607514400, 625654800, 638964000, 657104400, 671018400, 688554000, 702468000, 720003600, 733917600, 752058000, 765367200, 783507600, 796816800, 814957200, 828871200, 846406800, 860320800, 877856400, 891770400, 909306000, 923220000, 941360400, 954669600, 972810000, 986119200, 1004259600, 1018173600, 1035709200, 1049623200, 1067158800, 1081072800, 1099213200, 1112522400, 1130662800, 1143972000, 1162112400, 1175421600, 1193562000, 1207476000, 1225011600, 1238925600, 1256461200, 1268560800, 1289120400 }
1027+
trans:intvector { -1514739600, -1451667600, -1343145600, -1234803600, -1222963200, -1207242000, -873820800, -761418000, -686073600, -661539600, -620755200, -608144400, -589384800, -576082800, -557935200, -544633200, -526489200, -513183600, -495039600, -481734000, -463590000, -450284400, -431535600, -418230000, -400086000, -386780400, -368636400, -355330800, -337186800, -323881200, -305737200, -292431600, -273682800, -260982000, -242233200, -226508400, -210783600, -195058800, -179334000, -163609200, -147884400, -131554800, -116434800, -100105200, -84376800, -68655600, -52927200, -37206000, -21477600, -5756400, 9972000, 25693200, 41421600, 57747600, 73476000, 89197200, 104925600, 120646800, 126698400, 152096400, 162381600, 183546000, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309949200, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 452080800, 467802000, 483530400, 499251600, 514980000, 530701200, 544615200, 562150800, 576064800, 594205200, 607514400, 625654800, 638964000, 657104400, 671018400, 688554000, 702468000, 720003600, 733917600, 752058000, 765367200, 783507600, 796816800, 814957200, 828871200, 846406800, 860320800, 877856400, 891770400, 909306000, 923220000, 941360400, 954669600, 972810000, 986119200, 1004259600, 1018173600, 1035709200, 1049623200, 1067158800, 1081072800, 1099213200, 1112522400, 1130662800, 1143972000, 1162112400, 1175421600, 1193562000, 1207476000, 1225011600, 1238925600, 1256461200, 1268560800, 1289120400 }
10281028
typeOffsets:intvector { -28084, 0, -28800, 0, -28800, 3600, -25200, 0 }
1029-
typeMap:bin { "03010301020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
1029+
typeMap:bin { "030103010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
10301030
finalRule { "US" }
10311031
finalRaw:int { -28800 }
10321032
finalYear:int { 2011 }

‎icu4c/source/test/intltest/ustrtest.cpp‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2549,6 +2549,13 @@ void UnicodeStringTest::TestU16StringView() {
25492549
assertEquals("any + sv16", UnicodeString(true, u"anysv16", 7), x);
25502550
x = any + str16;
25512551
assertEquals("any + str16", UnicodeString(true, u"anystr16", 8), x);
2552+
2553+
// Check that ICU’s operator+ do not make the standard ones ambiguous on standard types.
2554+
// See ICU-23299.
2555+
std::u16string u16String = u"breites ";
2556+
char16_t mutableU16Array[] = u"Feld";
2557+
const std::u16string concatenation = u16String + mutableU16Array;
2558+
const std::u16string concatenationWithPointer = u16String + &*mutableU16Array;
25522559
}
25532560

25542561
void UnicodeStringTest::TestWStringView() {
@@ -2646,6 +2653,13 @@ void UnicodeStringTest::TestWStringView() {
26462653
assertEquals("any + sv16", UnicodeString(true, L"anysv16", 7), x);
26472654
x = any + str16;
26482655
assertEquals("any + str16", UnicodeString(true, L"anystr16", 8), x);
2656+
2657+
// Check that ICU’s operator+ do not make the standard ones ambiguous on standard types.
2658+
// See ICU-23299.
2659+
std::wstring wideString = L"breites ";
2660+
wchar_t mutableWideArray[] = L"Feld";
2661+
const std::wstring concatenation = wideString + mutableWideArray;
2662+
const std::wstring concatenationWithPointer = wideString + &*mutableWideArray;
26492663
#endif
26502664
}
26512665

‎icu4j/demos/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.ibm.icu</groupId>
1010
<artifactId>icu4j-root</artifactId>
11-
<version>78.1</version>
11+
<version>78.2</version>
1212
</parent>
1313

1414
<artifactId>demos</artifactId>

‎icu4j/main/charset/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.ibm.icu</groupId>
1010
<artifactId>icu4j-root</artifactId>
11-
<version>78.1</version>
11+
<version>78.2</version>
1212
<relativePath>../../pom.xml</relativePath>
1313
</parent>
1414

‎icu4j/main/collate/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.ibm.icu</groupId>
1010
<artifactId>icu4j-root</artifactId>
11-
<version>78.1</version>
11+
<version>78.2</version>
1212
<relativePath>../../pom.xml</relativePath>
1313
</parent>
1414

‎icu4j/main/common_tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.ibm.icu</groupId>
1010
<artifactId>icu4j-root</artifactId>
11-
<version>78.1</version>
11+
<version>78.2</version>
1212
<relativePath>../../pom.xml</relativePath>
1313
</parent>
1414

0 commit comments

Comments
 (0)