diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-08-13 18:52:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-13 18:52:43 +0200 |
| commit | ba2882cf71d06e121b7a023f954388768a5964dd (patch) | |
| tree | 70f1e0754b0bd39151721c248c3d2328f53ae71d /xpcom | |
| parent | 727eefc7c4f2b9197dc26d298340a12ca4feae36 (diff) | |
| parent | 9b48c3fa58c4926341e1668fdfec131ada3147a1 (diff) | |
| download | UXP-ba2882cf71d06e121b7a023f954388768a5964dd.tar UXP-ba2882cf71d06e121b7a023f954388768a5964dd.tar.gz UXP-ba2882cf71d06e121b7a023f954388768a5964dd.tar.lz UXP-ba2882cf71d06e121b7a023f954388768a5964dd.tar.xz UXP-ba2882cf71d06e121b7a023f954388768a5964dd.zip | |
Merge pull request #706 from trav90/gcc8
Fix/silence some warnings with GCC 8
Diffstat (limited to 'xpcom')
| -rw-r--r-- | xpcom/glue/nsTHashtable.h | 4 | ||||
| -rw-r--r-- | xpcom/string/nsReadableUtilsImpl.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xpcom/glue/nsTHashtable.h b/xpcom/glue/nsTHashtable.h index 705b0294e..830f52e88 100644 --- a/xpcom/glue/nsTHashtable.h +++ b/xpcom/glue/nsTHashtable.h @@ -372,7 +372,7 @@ template<class EntryType> PLDHashNumber nsTHashtable<EntryType>::s_HashKey(const void* aKey) { - return EntryType::HashKey(static_cast<const KeyTypePointer>(aKey)); + return EntryType::HashKey(static_cast<KeyTypePointer>(aKey)); } template<class EntryType> @@ -381,7 +381,7 @@ nsTHashtable<EntryType>::s_MatchEntry(const PLDHashEntryHdr* aEntry, const void* aKey) { return ((const EntryType*)aEntry)->KeyEquals( - static_cast<const KeyTypePointer>(aKey)); + static_cast<KeyTypePointer>(aKey)); } template<class EntryType> diff --git a/xpcom/string/nsReadableUtilsImpl.h b/xpcom/string/nsReadableUtilsImpl.h index ff1497b51..94f18dffc 100644 --- a/xpcom/string/nsReadableUtilsImpl.h +++ b/xpcom/string/nsReadableUtilsImpl.h @@ -18,7 +18,7 @@ inline bool IsASCII(char16_t aChar) { inline const char16_t* aligned(const char16_t* aPtr, const uintptr_t aMask) { return reinterpret_cast<const char16_t*>( - reinterpret_cast<const uintptr_t>(aPtr) & ~aMask); + reinterpret_cast<uintptr_t>(aPtr) & ~aMask); } /** |