From 1cdb070dd95f31833c7a1496db65d9bf920678ad Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Mon, 18 Nov 2013 21:58:27 -0500 Subject: [PATCH] Bug 940170 - part 4 - constify PLDHashTableOps in miscellaneous other places; r=bz --- .../components/commandhandler/src/nsCommandParams.cpp | 2 +- .../components/commandhandler/src/nsCommandParams.h | 2 +- rdf/base/src/nsRDFService.cpp | 10 +++++----- uriloader/base/nsDocLoader.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/embedding/components/commandhandler/src/nsCommandParams.cpp b/embedding/components/commandhandler/src/nsCommandParams.cpp index 489952f4d1d4..27d52d72459f 100644 --- a/embedding/components/commandhandler/src/nsCommandParams.cpp +++ b/embedding/components/commandhandler/src/nsCommandParams.cpp @@ -13,7 +13,7 @@ using namespace mozilla; -PLDHashTableOps nsCommandParams::sHashOps = +const PLDHashTableOps nsCommandParams::sHashOps = { PL_DHashAllocTable, PL_DHashFreeTable, diff --git a/embedding/components/commandhandler/src/nsCommandParams.h b/embedding/components/commandhandler/src/nsCommandParams.h index f18189a99d96..92a68ecb8238 100644 --- a/embedding/components/commandhandler/src/nsCommandParams.h +++ b/embedding/components/commandhandler/src/nsCommandParams.h @@ -147,7 +147,7 @@ protected: int32_t mCurEntry; int32_t mNumEntries; // number of entries at start of enumeration (-1 indicates not known) - static PLDHashTableOps sHashOps; + static const PLDHashTableOps sHashOps; }; diff --git a/rdf/base/src/nsRDFService.cpp b/rdf/base/src/nsRDFService.cpp index 76ac6bbe7a7f..f8d06892e4a9 100644 --- a/rdf/base/src/nsRDFService.cpp +++ b/rdf/base/src/nsRDFService.cpp @@ -139,7 +139,7 @@ struct ResourceHashEntry : public PLDHashEntryHdr { } }; -static PLDHashTableOps gResourceTableOps = { +static const PLDHashTableOps gResourceTableOps = { PL_DHashAllocTable, PL_DHashFreeTable, ResourceHashEntry::HashKey, @@ -177,7 +177,7 @@ struct LiteralHashEntry : public PLDHashEntryHdr { } }; -static PLDHashTableOps gLiteralTableOps = { +static const PLDHashTableOps gLiteralTableOps = { PL_DHashAllocTable, PL_DHashFreeTable, LiteralHashEntry::HashKey, @@ -214,7 +214,7 @@ struct IntHashEntry : public PLDHashEntryHdr { } }; -static PLDHashTableOps gIntTableOps = { +static const PLDHashTableOps gIntTableOps = { PL_DHashAllocTable, PL_DHashFreeTable, IntHashEntry::HashKey, @@ -255,7 +255,7 @@ struct DateHashEntry : public PLDHashEntryHdr { } }; -static PLDHashTableOps gDateTableOps = { +static const PLDHashTableOps gDateTableOps = { PL_DHashAllocTable, PL_DHashFreeTable, DateHashEntry::HashKey, @@ -373,7 +373,7 @@ struct BlobHashEntry : public PLDHashEntryHdr { } }; -static PLDHashTableOps gBlobTableOps = { +static const PLDHashTableOps gBlobTableOps = { PL_DHashAllocTable, PL_DHashFreeTable, BlobHashEntry::HashKey, diff --git a/uriloader/base/nsDocLoader.cpp b/uriloader/base/nsDocLoader.cpp index 45574ad48eb3..17c6339d95a4 100644 --- a/uriloader/base/nsDocLoader.cpp +++ b/uriloader/base/nsDocLoader.cpp @@ -116,7 +116,7 @@ nsDocLoader::nsDocLoader() } #endif /* PR_LOGGING */ - static PLDHashTableOps hash_table_ops = + static const PLDHashTableOps hash_table_ops = { PL_DHashAllocTable, PL_DHashFreeTable,