| Index: src/objects/hash-table.h
|
| diff --git a/src/objects/hash-table.h b/src/objects/hash-table.h
|
| index f83788a7224cc390bb5cd0ac4ac1a6080d9134cd..71cc371442279cd8336d779de8d86782f99922bc 100644
|
| --- a/src/objects/hash-table.h
|
| +++ b/src/objects/hash-table.h
|
| @@ -140,7 +140,7 @@ class HashTable : public HashTableBase {
|
| PretenureFlag pretenure = NOT_TENURED,
|
| MinimumCapacity capacity_option = USE_DEFAULT_MINIMUM_CAPACITY);
|
|
|
| - DECLARE_CAST(HashTable)
|
| + DECL_CAST(HashTable)
|
|
|
| // Garbage collection support.
|
| void IteratePrefix(ObjectVisitor* visitor);
|
| @@ -282,7 +282,7 @@ class ObjectHashTable
|
| typedef HashTable<ObjectHashTable, ObjectHashTableShape> DerivedHashTable;
|
|
|
| public:
|
| - DECLARE_CAST(ObjectHashTable)
|
| + DECL_CAST(ObjectHashTable)
|
|
|
| // Attempt to shrink hash table after removal of key.
|
| MUST_USE_RESULT static inline Handle<ObjectHashTable> Shrink(
|
| @@ -337,7 +337,7 @@ class ObjectHashSet : public HashTable<ObjectHashSet, ObjectHashSetShape> {
|
| inline bool Has(Isolate* isolate, Handle<Object> key, int32_t hash);
|
| inline bool Has(Isolate* isolate, Handle<Object> key);
|
|
|
| - DECLARE_CAST(ObjectHashSet)
|
| + DECL_CAST(ObjectHashSet)
|
| };
|
|
|
| // OrderedHashTable is a HashTable with Object keys that preserves
|
| @@ -543,7 +543,7 @@ class OrderedHashTable : public FixedArray {
|
|
|
| class OrderedHashSet : public OrderedHashTable<OrderedHashSet, 1> {
|
| public:
|
| - DECLARE_CAST(OrderedHashSet)
|
| + DECL_CAST(OrderedHashSet)
|
|
|
| static Handle<OrderedHashSet> Add(Handle<OrderedHashSet> table,
|
| Handle<Object> value);
|
| @@ -553,7 +553,7 @@ class OrderedHashSet : public OrderedHashTable<OrderedHashSet, 1> {
|
|
|
| class OrderedHashMap : public OrderedHashTable<OrderedHashMap, 2> {
|
| public:
|
| - DECLARE_CAST(OrderedHashMap)
|
| + DECL_CAST(OrderedHashMap)
|
|
|
| // Returns a value if the OrderedHashMap contains the key, otherwise
|
| // returns undefined.
|
| @@ -584,7 +584,7 @@ class WeakHashTable : public HashTable<WeakHashTable, WeakHashTableShape<2>> {
|
| typedef HashTable<WeakHashTable, WeakHashTableShape<2>> DerivedHashTable;
|
|
|
| public:
|
| - DECLARE_CAST(WeakHashTable)
|
| + DECL_CAST(WeakHashTable)
|
|
|
| // Looks up the value associated with the given key. The hole value is
|
| // returned in case the key is not present.
|
| @@ -764,7 +764,7 @@ class SmallOrderedHashTable : public HeapObject {
|
| // SmallOrderedHashTable::Grow.
|
| static const int kGrowthHack = 256;
|
|
|
| - DECLARE_VERIFIER(SmallOrderedHashTable)
|
| + DECL_VERIFIER(SmallOrderedHashTable)
|
|
|
| protected:
|
| // This is used for accessing the non |DataTable| part of the
|
| @@ -792,9 +792,9 @@ class SmallOrderedHashTable : public HeapObject {
|
|
|
| class SmallOrderedHashSet : public SmallOrderedHashTable<SmallOrderedHashSet> {
|
| public:
|
| - DECLARE_CAST(SmallOrderedHashSet)
|
| + DECL_CAST(SmallOrderedHashSet)
|
|
|
| - DECLARE_PRINTER(SmallOrderedHashSet)
|
| + DECL_PRINTER(SmallOrderedHashSet)
|
|
|
| static const int kKeyIndex = 0;
|
| static const int kEntrySize = 1;
|
| @@ -808,9 +808,9 @@ class SmallOrderedHashSet : public SmallOrderedHashTable<SmallOrderedHashSet> {
|
|
|
| class SmallOrderedHashMap : public SmallOrderedHashTable<SmallOrderedHashMap> {
|
| public:
|
| - DECLARE_CAST(SmallOrderedHashMap)
|
| + DECL_CAST(SmallOrderedHashMap)
|
|
|
| - DECLARE_PRINTER(SmallOrderedHashMap)
|
| + DECL_PRINTER(SmallOrderedHashMap)
|
|
|
| static const int kKeyIndex = 0;
|
| static const int kValueIndex = 1;
|
| @@ -887,10 +887,10 @@ class JSSetIterator
|
| : public OrderedHashTableIterator<JSSetIterator, OrderedHashSet> {
|
| public:
|
| // Dispatched behavior.
|
| - DECLARE_PRINTER(JSSetIterator)
|
| - DECLARE_VERIFIER(JSSetIterator)
|
| + DECL_PRINTER(JSSetIterator)
|
| + DECL_VERIFIER(JSSetIterator)
|
|
|
| - DECLARE_CAST(JSSetIterator)
|
| + DECL_CAST(JSSetIterator)
|
|
|
| // Called by |Next| to populate the array. This allows the subclasses to
|
| // populate the array differently.
|
| @@ -904,10 +904,10 @@ class JSMapIterator
|
| : public OrderedHashTableIterator<JSMapIterator, OrderedHashMap> {
|
| public:
|
| // Dispatched behavior.
|
| - DECLARE_PRINTER(JSMapIterator)
|
| - DECLARE_VERIFIER(JSMapIterator)
|
| + DECL_PRINTER(JSMapIterator)
|
| + DECL_VERIFIER(JSMapIterator)
|
|
|
| - DECLARE_CAST(JSMapIterator)
|
| + DECL_CAST(JSMapIterator)
|
|
|
| // Called by |Next| to populate the array. This allows the subclasses to
|
| // populate the array differently.
|
|
|