Skip to content

Commit 3a84608

Browse files
committed
[4.2] Remove final from ICU4C UnicodeSet class
This fixes a warning in Clang: -Wunnecessary-virtual-specifier
1 parent dd04c3d commit 3a84608

3 files changed

Lines changed: 16 additions & 1 deletion

File tree

thirdparty/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,8 @@ Files generated from upstream source:
382382
4. Delete `data/out` folder and rebuild data: `cd data && rm -rf ./out && make`
383383
5. Copy `source/data/out/icudt73l.dat` to the `{GODOT_SOURCE}/thirdparty/icu4c/icudt73l.dat`
384384

385+
Apply `patches` to fix the `-Wunnecessary-virtual-specifier` warning in Clang. Newer versions of ICU4C do not have this warning, this only applies to older versions.
386+
385387

386388
## jpeg-compressor
387389

thirdparty/icu4c/common/unicode/uniset.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ class RuleCharacterIterator;
282282
* @author Alan Liu
283283
* @stable ICU 2.0
284284
*/
285-
class U_COMMON_API UnicodeSet final : public UnicodeFilter {
285+
class U_COMMON_API UnicodeSet : public UnicodeFilter {
286286
private:
287287
/**
288288
* Enough for sets with few ranges.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/thirdparty/icu4c/common/unicode/uniset.h b/thirdparty/icu4c/common/unicode/uniset.h
2+
index 127e4ce..f68e714 100644
3+
--- a/thirdparty/icu4c/common/unicode/uniset.h
4+
+++ b/thirdparty/icu4c/common/unicode/uniset.h
5+
@@ -282,7 +282,7 @@ class RuleCharacterIterator;
6+
* @author Alan Liu
7+
* @stable ICU 2.0
8+
*/
9+
-class U_COMMON_API UnicodeSet final : public UnicodeFilter {
10+
+class U_COMMON_API UnicodeSet : public UnicodeFilter {
11+
private:
12+
/**
13+
* Enough for sets with few ranges.

0 commit comments

Comments
 (0)