summaryrefslogtreecommitdiff
path: root/chromium/content/browser/indexed_db/indexed_db_leveldb_coding.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/browser/indexed_db/indexed_db_leveldb_coding.cc')
-rw-r--r--chromium/content/browser/indexed_db/indexed_db_leveldb_coding.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chromium/content/browser/indexed_db/indexed_db_leveldb_coding.cc b/chromium/content/browser/indexed_db/indexed_db_leveldb_coding.cc
index f8a3a1e51bd..45656a86038 100644
--- a/chromium/content/browser/indexed_db/indexed_db_leveldb_coding.cc
+++ b/chromium/content/browser/indexed_db/indexed_db_leveldb_coding.cc
@@ -223,9 +223,9 @@ static const unsigned char kIndexMetaDataTypeMaximum = 255;
const unsigned char kMinimumIndexId = 30;
-inline void EncodeIntSafely(int64 nParam, int64 max, std::string* into) {
- DCHECK_LE(nParam, max);
- return EncodeInt(nParam, into);
+inline void EncodeIntSafely(int64 value, int64 max, std::string* into) {
+ DCHECK_LE(value, max);
+ return EncodeInt(value, into);
}
std::string MaxIDBKey() {
@@ -1256,10 +1256,10 @@ std::string KeyPrefix::EncodeInternal(int64 database_id,
kMaxIndexIdSizeBits) |
(object_store_id_string.size() - 1) << kMaxIndexIdSizeBits |
(index_id_string.size() - 1);
- COMPILE_ASSERT(kMaxDatabaseIdSizeBits + kMaxObjectStoreIdSizeBits +
- kMaxIndexIdSizeBits ==
- sizeof(first_byte) * 8,
- CANT_ENCODE_IDS);
+ static_assert(kMaxDatabaseIdSizeBits + kMaxObjectStoreIdSizeBits +
+ kMaxIndexIdSizeBits ==
+ sizeof(first_byte) * 8,
+ "cannot encode ids");
std::string ret;
ret.reserve(kDefaultInlineBufferSize);
ret.push_back(first_byte);