diff --git a/netwerk/base/src/nsLoadGroup.cpp b/netwerk/base/src/nsLoadGroup.cpp index 036b3f75a8d2..c0543c3b5608 100644 --- a/netwerk/base/src/nsLoadGroup.cpp +++ b/netwerk/base/src/nsLoadGroup.cpp @@ -1156,7 +1156,7 @@ nsLoadGroupConnectionInfo::SetSpdyPushCache(mozilla::net::SpdyPushCache *aSpdyPu nsresult nsLoadGroup::Init() { - static PLDHashTableOps hash_table_ops = + static const PLDHashTableOps hash_table_ops = { PL_DHashAllocTable, PL_DHashFreeTable, diff --git a/netwerk/cache/nsCacheEntry.cpp b/netwerk/cache/nsCacheEntry.cpp index 42f964de39ae..d639b2713822 100644 --- a/netwerk/cache/nsCacheEntry.cpp +++ b/netwerk/cache/nsCacheEntry.cpp @@ -374,7 +374,7 @@ nsCacheEntryInfo::IsStreamBased(bool * result) * nsCacheEntryHashTable *****************************************************************************/ -PLDHashTableOps +const PLDHashTableOps nsCacheEntryHashTable::ops = { PL_DHashAllocTable, diff --git a/netwerk/cache/nsCacheEntry.h b/netwerk/cache/nsCacheEntry.h index 09382c57e16f..06d305090ac3 100644 --- a/netwerk/cache/nsCacheEntry.h +++ b/netwerk/cache/nsCacheEntry.h @@ -303,9 +303,9 @@ private: void * arg); // member variables - static PLDHashTableOps ops; - PLDHashTable table; - bool initialized; + static const PLDHashTableOps ops; + PLDHashTable table; + bool initialized; }; #endif // _nsCacheEntry_h_ diff --git a/netwerk/cache/nsDiskCacheBinding.cpp b/netwerk/cache/nsDiskCacheBinding.cpp index 50e6a03da429..d07243f2e5f9 100644 --- a/netwerk/cache/nsDiskCacheBinding.cpp +++ b/netwerk/cache/nsDiskCacheBinding.cpp @@ -122,7 +122,7 @@ nsDiskCacheBinding::EnsureStreamIO() * *****************************************************************************/ -PLDHashTableOps nsDiskCacheBindery::ops = +const PLDHashTableOps nsDiskCacheBindery::ops = { PL_DHashAllocTable, PL_DHashFreeTable, diff --git a/netwerk/cache/nsDiskCacheBinding.h b/netwerk/cache/nsDiskCacheBinding.h index 2f7f508a399f..e2649b398b17 100644 --- a/netwerk/cache/nsDiskCacheBinding.h +++ b/netwerk/cache/nsDiskCacheBinding.h @@ -112,7 +112,7 @@ private: nsresult AddBinding(nsDiskCacheBinding * binding); // member variables - static PLDHashTableOps ops; + static const PLDHashTableOps ops; PLDHashTable table; bool initialized; }; diff --git a/netwerk/cache2/CacheFileIOManager.cpp b/netwerk/cache2/CacheFileIOManager.cpp index 1edbe12c4c9c..3478fa0e348c 100644 --- a/netwerk/cache2/CacheFileIOManager.cpp +++ b/netwerk/cache2/CacheFileIOManager.cpp @@ -99,7 +99,7 @@ public: SHA1Sum::Hash mHash; }; -PLDHashTableOps CacheFileHandles::mOps = +const PLDHashTableOps CacheFileHandles::mOps = { PL_DHashAllocTable, PL_DHashFreeTable, diff --git a/netwerk/cache2/CacheFileIOManager.h b/netwerk/cache2/CacheFileIOManager.h index 3de641a76661..58ffbcf6f476 100644 --- a/netwerk/cache2/CacheFileIOManager.h +++ b/netwerk/cache2/CacheFileIOManager.h @@ -83,9 +83,9 @@ private: PLDHashEntryHdr *to); static void ClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry); - static PLDHashTableOps mOps; - PLDHashTable mTable; - bool mInitialized; + static const PLDHashTableOps mOps; + PLDHashTable mTable; + bool mInitialized; }; //////////////////////////////////////////////////////////////////////////////// diff --git a/netwerk/dns/nsHostResolver.cpp b/netwerk/dns/nsHostResolver.cpp index 0921c7996e93..f53b59c350f4 100644 --- a/netwerk/dns/nsHostResolver.cpp +++ b/netwerk/dns/nsHostResolver.cpp @@ -352,7 +352,7 @@ HostDB_InitEntry(PLDHashTable *table, return true; } -static PLDHashTableOps gHostDB_ops = +static const PLDHashTableOps gHostDB_ops = { PL_DHashAllocTable, PL_DHashFreeTable,