wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1170794 followup: Add 'override' annotations to Convert() & Reset() methods in intl/uconv. rs=ehsan

Browse Source 
Landing on CLOSED TREE with a=RyanVM

The fixed warnings are "-Winconsistent-missing-override", and they started being spammed here because the main patch on this bug added another method to these classes, which was (correctly) labeled as 'override'. This meant these preexisting un-annotated methods "inconsistently missing" the annotation. So, adding the annotation to fix the inconsistency & make clang happy.
This commit is contained in:
Daniel Holbert 2015-06-18 12:09:23 -07:00
parent 4e7ff2332a
commit db410a7550
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intl/uconv/nsReplacementToUnicode.h
View File

@ -22,13 +22,13 @@ public:
NS_IMETHOD Convert(const char* aSrc,
int32_t* aSrcLength,
char16_t* aDest,
int32_t* aDestLength);
int32_t* aDestLength) override;
MOZ_WARN_UNUSED_RESULT NS_IMETHOD GetMaxLength(const char* aSrc,
int32_t aSrcLength,
int32_t* aDestLength) override;
NS_IMETHOD Reset();
NS_IMETHOD Reset() override;
private:
bool mSeenByte;

4
intl/uconv/nsUTF8ToUnicode.h
View File

@ -57,12 +57,12 @@ protected:
// Subclassing of nsBasicDecoderSupport class [declaration]
NS_IMETHOD Convert(const char * aSrc, int32_t * aSrcLength,
char16_t * aDest, int32_t * aDestLength);
char16_t * aDest, int32_t * aDestLength) override;
//--------------------------------------------------------------------
// Subclassing of nsBasicDecoderSupport class [declaration]
NS_IMETHOD Reset();
NS_IMETHOD Reset() override;
};

2
intl/uconv/ucvlatin/nsUTF16ToUnicode.h
View File

@ -27,7 +27,7 @@ public:
MOZ_WARN_UNUSED_RESULT NS_IMETHOD GetMaxLength(const char* aSrc,
int32_t aSrcLength,
int32_t* aDestLength) override;
NS_IMETHOD Reset();
NS_IMETHOD Reset() override;
protected:
uint8_t mState;