patches/woverloaded-virtual.patch - Issue 1296803002: Fix -Woverloaded-virtual warnings in ICU.

Side by Side Diff: patches/woverloaded-virtual.patch

Issue 1296803002: Fix -Woverloaded-virtual warnings in ICU. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master

Patch Set: patch Created 5 years, 4 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
(Empty)
	1 Index: source/i18n/windtfmt.h

	2 diff --git a/source/i18n/windtfmt.h b/source/i18n/windtfmt.h

	3 index 0c182f54e649d0a234eff428856c436c90623d23..3f6d666574ffd9e3dedb423f53609005 f3d5d2cd 100644

	4 --- a/source/i18n/windtfmt.h

	5 +++ b/source/i18n/windtfmt.h

	6 @@ -52,8 +52,6 @@ public:

	7

	8 UnicodeString &format(Calendar &cal, UnicodeString &appendTo, FieldPosition &pos) const;

	9

	10 - UnicodeString& format(UDate date, UnicodeString& appendTo) const;

	11 -

	12 void parse(const UnicodeString& text, Calendar& cal, ParsePosition& pos) co nst;

	13

	14 /**

	15 @@ -127,10 +125,6 @@ private:

	16 TIME_ZONE_INFORMATION *fTZI;

	17 };

	18

	19 -inline UnicodeString &Win32DateFormat::format(UDate date, UnicodeString& append To) const {

	20 - return DateFormat::format(date, appendTo);

	21 -}

	22 -

	23 U_NAMESPACE_END

	24

	25 #endif /* #if !UCONFIG_NO_FORMATTING */

	26 Index: source/i18n/winnmfmt.cpp

	27 diff --git a/source/i18n/winnmfmt.cpp b/source/i18n/winnmfmt.cpp

	28 index 58e2a497b194bc281a817d9ced39372efab0bfee..d5ea8bde07acea3c0fa3b48aa63c07e0 54fecbc1 100644

	29 --- a/source/i18n/winnmfmt.cpp

	30 +++ b/source/i18n/winnmfmt.cpp

	31 @@ -209,17 +209,17 @@ Format *Win32NumberFormat::clone(void) const

	32

	33 UnicodeString& Win32NumberFormat::format(double number, UnicodeString& appendTo , FieldPosition& pos) const

	34 {

	35 - return format(getMaximumFractionDigits(), appendTo, L"%.16f", number);

	36 + return variadicFormat(getMaximumFractionDigits(), appendTo, L"%.16f", numbe r);

	37 }

	38

	39 UnicodeString& Win32NumberFormat::format(int32_t number, UnicodeString& appendT o, FieldPosition& pos) const

	40 {

	41 - return format(getMinimumFractionDigits(), appendTo, L"%I32d", number);

	42 + return variadicFormat(getMinimumFractionDigits(), appendTo, L"%I32d", numbe r);

	43 }

	44

	45 UnicodeString& Win32NumberFormat::format(int64_t number, UnicodeString& appendT o, FieldPosition& pos) const

	46 {

	47 - return format(getMinimumFractionDigits(), appendTo, L"%I64d", number);

	48 + return variadicFormat(getMinimumFractionDigits(), appendTo, L"%I64d", numbe r);

	49 }

	50

	51 void Win32NumberFormat::parse(const UnicodeString& text, Formattable& result, P arsePosition& parsePosition) const

	52 @@ -242,7 +242,7 @@ void Win32NumberFormat::setMinimumFractionDigits(int32_t new Value)

	53 NumberFormat::setMinimumFractionDigits(newValue);

	54 }

	55

	56 -UnicodeString &Win32NumberFormat::format(int32_t numDigits, UnicodeString &appe ndTo, const wchar_t *fmt, ...) const

	57 +UnicodeString &Win32NumberFormat::variadicFormat(int32_t numDigits, UnicodeStri ng &appendTo, const wchar_t *fmt, ...) const

	58 {

	59 wchar_t nStackBuffer[STACK_BUFFER_SIZE];

	60 wchar_t *nBuffer = nStackBuffer;

	61 Index: source/i18n/winnmfmt.h

	62 diff --git a/source/i18n/winnmfmt.h b/source/i18n/winnmfmt.h

	63 index 5421a454e148b3c6bf747b559a67712b9331c1b8..d4ef66e36a655d9cdb6a15a32ce18277 f34fef50 100644

	64 --- a/source/i18n/winnmfmt.h

	65 +++ b/source/i18n/winnmfmt.h

	66 @@ -143,7 +143,7 @@ public:

	67 virtual UClassID getDynamicClassID(void) const;

	68

	69 private:

	70 - UnicodeString &format(int32_t numDigits, UnicodeString &appendTo, const wch ar_t *format, ...) const;

	71 + UnicodeString &variadicFormat(int32_t numDigits, UnicodeString &appendTo, c onst wchar_t *format, ...) const;

	72

	73 UBool fCurrency;

	74 Locale fLocale;

OLD	NEW

« no previous file with comments | « README.chromium ('k') | source/i18n/windtfmt.h » ('j') | no next file with comments »