Index: src/objects-inl.h |
diff --git a/src/objects-inl.h b/src/objects-inl.h |
index 1ddbc8c8179e0cb8f11a134274616b7eb0a7da8c..4e7748d387f7278dbcb544d402ed27d42caf68aa 100644 |
--- a/src/objects-inl.h |
+++ b/src/objects-inl.h |
@@ -509,7 +509,7 @@ class SequentialStringKey : public HashTableKey { |
explicit SequentialStringKey(Vector<const Char> string, uint32_t seed) |
: string_(string), hash_field_(0), seed_(seed) { } |
- uint32_t Hash() OVERRIDE { |
+ uint32_t Hash() override { |
hash_field_ = StringHasher::HashSequentialString<Char>(string_.start(), |
string_.length(), |
seed_); |
@@ -520,7 +520,7 @@ class SequentialStringKey : public HashTableKey { |
} |
- uint32_t HashForObject(Object* other) OVERRIDE { |
+ uint32_t HashForObject(Object* other) override { |
return String::cast(other)->Hash(); |
} |
@@ -535,11 +535,11 @@ class OneByteStringKey : public SequentialStringKey<uint8_t> { |
OneByteStringKey(Vector<const uint8_t> str, uint32_t seed) |
: SequentialStringKey<uint8_t>(str, seed) { } |
- bool IsMatch(Object* string) OVERRIDE { |
+ bool IsMatch(Object* string) override { |
return String::cast(string)->IsOneByteEqualTo(string_); |
} |
- Handle<Object> AsHandle(Isolate* isolate) OVERRIDE; |
+ Handle<Object> AsHandle(Isolate* isolate) override; |
}; |
@@ -550,7 +550,7 @@ class SeqOneByteSubStringKey : public HashTableKey { |
DCHECK(string_->IsSeqOneByteString()); |
} |
- uint32_t Hash() OVERRIDE { |
+ uint32_t Hash() override { |
DCHECK(length_ >= 0); |
DCHECK(from_ + length_ <= string_->length()); |
const uint8_t* chars = string_->GetChars() + from_; |
@@ -561,12 +561,12 @@ class SeqOneByteSubStringKey : public HashTableKey { |
return result; |
} |
- uint32_t HashForObject(Object* other) OVERRIDE { |
+ uint32_t HashForObject(Object* other) override { |
return String::cast(other)->Hash(); |
} |
- bool IsMatch(Object* string) OVERRIDE; |
- Handle<Object> AsHandle(Isolate* isolate) OVERRIDE; |
+ bool IsMatch(Object* string) override; |
+ Handle<Object> AsHandle(Isolate* isolate) override; |
private: |
Handle<SeqOneByteString> string_; |
@@ -581,11 +581,11 @@ class TwoByteStringKey : public SequentialStringKey<uc16> { |
explicit TwoByteStringKey(Vector<const uc16> str, uint32_t seed) |
: SequentialStringKey<uc16>(str, seed) { } |
- bool IsMatch(Object* string) OVERRIDE { |
+ bool IsMatch(Object* string) override { |
return String::cast(string)->IsTwoByteEqualTo(string_); |
} |
- Handle<Object> AsHandle(Isolate* isolate) OVERRIDE; |
+ Handle<Object> AsHandle(Isolate* isolate) override; |
}; |
@@ -595,11 +595,11 @@ class Utf8StringKey : public HashTableKey { |
explicit Utf8StringKey(Vector<const char> string, uint32_t seed) |
: string_(string), hash_field_(0), seed_(seed) { } |
- bool IsMatch(Object* string) OVERRIDE { |
+ bool IsMatch(Object* string) override { |
return String::cast(string)->IsUtf8EqualTo(string_); |
} |
- uint32_t Hash() OVERRIDE { |
+ uint32_t Hash() override { |
if (hash_field_ != 0) return hash_field_ >> String::kHashShift; |
hash_field_ = StringHasher::ComputeUtf8Hash(string_, seed_, &chars_); |
uint32_t result = hash_field_ >> String::kHashShift; |
@@ -607,11 +607,11 @@ class Utf8StringKey : public HashTableKey { |
return result; |
} |
- uint32_t HashForObject(Object* other) OVERRIDE { |
+ uint32_t HashForObject(Object* other) override { |
return String::cast(other)->Hash(); |
} |
- Handle<Object> AsHandle(Isolate* isolate) OVERRIDE { |
+ Handle<Object> AsHandle(Isolate* isolate) override { |
if (hash_field_ == 0) Hash(); |
return isolate->factory()->NewInternalizedStringFromUtf8( |
string_, chars_, hash_field_); |
@@ -7468,7 +7468,7 @@ Object* JSMapIterator::CurrentValue() { |
} |
-class String::SubStringRange::iterator FINAL { |
+class String::SubStringRange::iterator final { |
public: |
typedef std::forward_iterator_tag iterator_category; |
typedef int difference_type; |