зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1170794 followup: Add 'override' annotations to Convert() & Reset() methods in intl/uconv. rs=ehsan
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:
Родитель
1e009d6b0f
Коммит
b89e046ffc
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
};
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче