summaryrefslogtreecommitdiff
path: root/base/values.h
diff options
context:
space:
mode:
authorHidehiko Abe <hidehiko@google.com>2018-02-21 01:04:53 +0900
committerHidehiko Abe <hidehiko@google.com>2018-02-21 01:15:15 +0900
commitf810b5921dde57180956b9eadf39a3a2b8cb5855 (patch)
treeb5545667cc754e2b0745fb59dd891d65d30afaeb /base/values.h
parent4e42e67fa291bd27b2ffb00be57a4ca9a5000526 (diff)
downloadlibchrome-f810b5921dde57180956b9eadf39a3a2b8cb5855.tar.gz
Re-uprev to r462023.
Previous uprevs didn't include several CLs. This re-uprev's to the r462023. cf) Missing CLs I found. https://codereview.chromium.org/2556563002 https://codereview.chromium.org/2754483002 https://codereview.chromium.org/2171833002 https://codereview.chromium.org/2778183003 https://codereview.chromium.org/2500473002 https://codereview.chromium.org/2173523002 https://codereview.chromium.org/2666423002 https://codereview.chromium.org/2723423002 https://codereview.chromium.org/2789463002 https://codereview.chromium.org/2723083004 https://codereview.chromium.org/2637843002 https://codereview.chromium.org/2785943004 https://codereview.chromium.org/2657603004 https://codereview.chromium.org/2774363003 https://codereview.chromium.org/2776853002 https://codereview.chromium.org/2736053003 https://codereview.chromium.org/2779413002 https://codereview.chromium.org/2782503002 https://codereview.chromium.org/2782083003 https://codereview.chromium.org/2399213005 https://codereview.chromium.org/2787383002 https://codereview.chromium.org/2790523004 https://codereview.chromium.org/2787533002 https://codereview.chromium.org/2780983003 https://codereview.chromium.org/2790403003 https://codereview.chromium.org/2747673002 https://codereview.chromium.org/2778173003 https://codereview.chromium.org/2788613004 https://codereview.chromium.org/2781983003 https://codereview.chromium.org/2774223003 Bug: 73270448 Test: Built and ran libchrome_test locally. Run treehugger. Change-Id: I5e76096d4fcf660571275cce5f4a980a8bb574fe
Diffstat (limited to 'base/values.h')
-rw-r--r--base/values.h14
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;