diff options
Diffstat (limited to 'base/values.h')
-rw-r--r-- | base/values.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/base/values.h b/base/values.h index 95d5d1c2ba..925152dbee 100644 --- a/base/values.h +++ b/base/values.h @@ -75,7 +75,7 @@ class BASE_EXPORT Value { Value(const Value& that); Value(Value&& that) noexcept; - Value(); // A null value. + Value() noexcept; // A null value. explicit Value(Type type); explicit Value(bool in_bool); explicit Value(int in_int); @@ -89,16 +89,16 @@ class BASE_EXPORT Value { // arguments. explicit Value(const char* in_string); explicit Value(const std::string& in_string); - explicit Value(std::string&& in_string); + explicit Value(std::string&& in_string) noexcept; explicit Value(const char16* in_string); explicit Value(const string16& in_string); explicit Value(StringPiece in_string); explicit Value(const std::vector<char>& in_blob); - explicit Value(std::vector<char>&& in_blob); + explicit Value(std::vector<char>&& in_blob) noexcept; Value& operator=(const Value& that); - Value& operator=(Value&& that); + Value& operator=(Value&& that) noexcept; ~Value(); @@ -157,6 +157,8 @@ class BASE_EXPORT Value { // to the copy. The caller gets ownership of the copy, of course. // Subclasses return their own type directly in their overrides; // this works because C++ supports covariant return types. + // DEPRECATED, use Value's copy constructor instead. + // TODO(crbug.com/646113): Delete this and migrate callsites. Value* DeepCopy() const; // Preferred version of DeepCopy. TODO(estade): remove the above. std::unique_ptr<Value> CreateDeepCopy() const; @@ -364,6 +366,8 @@ class BASE_EXPORT DictionaryValue : public Value { DictStorage::const_iterator it_; }; + // DEPRECATED, use DictionaryValue's copy constructor instead. + // TODO(crbug.com/646113): Delete this and migrate callsites. DictionaryValue* DeepCopy() const; // Preferred version of DeepCopy. TODO(estade): remove the above. std::unique_ptr<DictionaryValue> CreateDeepCopy() const; @@ -480,6 +484,8 @@ class BASE_EXPORT ListValue : public Value { const_iterator begin() const { return list_->begin(); } const_iterator end() const { return list_->end(); } + // DEPRECATED, use ListValue's copy constructor instead. + // TODO(crbug.com/646113): Delete this and migrate callsites. ListValue* DeepCopy() const; // Preferred version of DeepCopy. TODO(estade): remove DeepCopy. std::unique_ptr<ListValue> CreateDeepCopy() const; |