Index: base/values.h |
diff --git a/base/values.h b/base/values.h |
index d5e631310319f2476b5fe80eabeb96ec9b88a0da..70a3ca0b941846931142a0c08ea0857b7482c104 100644 |
--- a/base/values.h |
+++ b/base/values.h |
@@ -124,13 +124,13 @@ class BASE_EXPORT FundamentalValue : public Value { |
virtual ~FundamentalValue(); |
// Overridden from Value: |
- virtual bool GetAsBoolean(bool* out_value) const OVERRIDE; |
- virtual bool GetAsInteger(int* out_value) const OVERRIDE; |
+ bool GetAsBoolean(bool* out_value) const override; |
+ bool GetAsInteger(int* out_value) const override; |
// Values of both type TYPE_INTEGER and TYPE_DOUBLE can be obtained as |
// doubles. |
- virtual bool GetAsDouble(double* out_value) const OVERRIDE; |
- virtual FundamentalValue* DeepCopy() const OVERRIDE; |
- virtual bool Equals(const Value* other) const OVERRIDE; |
+ bool GetAsDouble(double* out_value) const override; |
+ FundamentalValue* DeepCopy() const override; |
+ bool Equals(const Value* other) const override; |
private: |
union { |
@@ -155,11 +155,11 @@ class BASE_EXPORT StringValue : public Value { |
const std::string& GetString() const; |
// Overridden from Value: |
- virtual bool GetAsString(std::string* out_value) const OVERRIDE; |
- virtual bool GetAsString(string16* out_value) const OVERRIDE; |
- virtual bool GetAsString(const StringValue** out_value) const OVERRIDE; |
- virtual StringValue* DeepCopy() const OVERRIDE; |
- virtual bool Equals(const Value* other) const OVERRIDE; |
+ bool GetAsString(std::string* out_value) const override; |
+ bool GetAsString(string16* out_value) const override; |
+ bool GetAsString(const StringValue** out_value) const override; |
+ StringValue* DeepCopy() const override; |
+ bool Equals(const Value* other) const override; |
private: |
std::string value_; |
@@ -188,8 +188,8 @@ class BASE_EXPORT BinaryValue: public Value { |
const char* GetBuffer() const { return buffer_.get(); } |
// Overridden from Value: |
- virtual BinaryValue* DeepCopy() const OVERRIDE; |
- virtual bool Equals(const Value* other) const OVERRIDE; |
+ BinaryValue* DeepCopy() const override; |
+ bool Equals(const Value* other) const override; |
private: |
scoped_ptr<char[]> buffer_; |
@@ -207,9 +207,8 @@ class BASE_EXPORT DictionaryValue : public Value { |
virtual ~DictionaryValue(); |
// Overridden from Value: |
- virtual bool GetAsDictionary(DictionaryValue** out_value) OVERRIDE; |
- virtual bool GetAsDictionary( |
- const DictionaryValue** out_value) const OVERRIDE; |
+ bool GetAsDictionary(DictionaryValue** out_value) override; |
+ bool GetAsDictionary(const DictionaryValue** out_value) const override; |
// Returns true if the current dictionary has a value for the given key. |
bool HasKey(const std::string& key) const; |
@@ -362,8 +361,8 @@ class BASE_EXPORT DictionaryValue : public Value { |
}; |
// Overridden from Value: |
- virtual DictionaryValue* DeepCopy() const OVERRIDE; |
- virtual bool Equals(const Value* other) const OVERRIDE; |
+ DictionaryValue* DeepCopy() const override; |
+ bool Equals(const Value* other) const override; |
private: |
ValueMap dictionary_; |
@@ -476,10 +475,10 @@ class BASE_EXPORT ListValue : public Value { |
const_iterator end() const { return list_.end(); } |
// Overridden from Value: |
- virtual bool GetAsList(ListValue** out_value) OVERRIDE; |
- virtual bool GetAsList(const ListValue** out_value) const OVERRIDE; |
- virtual ListValue* DeepCopy() const OVERRIDE; |
- virtual bool Equals(const Value* other) const OVERRIDE; |
+ bool GetAsList(ListValue** out_value) override; |
+ bool GetAsList(const ListValue** out_value) const override; |
+ ListValue* DeepCopy() const override; |
+ bool Equals(const Value* other) const override; |
private: |
ValueVector list_; |