aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Caruso <ejcaruso@chromium.org>2018-03-05 11:52:41 -0800
committerchrome-bot <chrome-bot@chromium.org>2018-03-05 18:34:36 -0800
commit918c24d85d1b22844b3cc11adacc358bb3d5559c (patch)
tree39eb2a86fb0b19fb9f46c54c142187b0c5ce1ae9
parentbdfc8281d8e94e47bddf2f9f7401bcdb3beb80ad (diff)
downloadplatform_external_libbrillo-918c24d85d1b22844b3cc11adacc358bb3d5559c.tar.gz
platform_external_libbrillo-918c24d85d1b22844b3cc11adacc358bb3d5559c.tar.bz2
platform_external_libbrillo-918c24d85d1b22844b3cc11adacc358bb3d5559c.zip
libbrillo: use std::make_unique in Value construction
You can return std::unique_ptr<Derived> when the return value is declared as std::unique_ptr<Base> if Derived <: Base, so there is no reason not to use std::make_unique here. Also, since libchrome inlined FundamentalValue into Value, we can explicitly use those constructors instead. BUG=b:37434548 TEST=emerge Change-Id: Ia30bcec79c7b618d0051bf7c054858684327685f Reviewed-on: https://chromium-review.googlesource.com/949663 Commit-Ready: Eric Caruso <ejcaruso@chromium.org> Tested-by: Eric Caruso <ejcaruso@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org>
-rw-r--r--brillo/value_conversion.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/brillo/value_conversion.cc b/brillo/value_conversion.cc
index 9f8eab1..d1acc37 100644
--- a/brillo/value_conversion.cc
+++ b/brillo/value_conversion.cc
@@ -38,23 +38,23 @@ bool FromValue(const base::Value& in_value,
}
std::unique_ptr<base::Value> ToValue(int value) {
- return std::unique_ptr<base::Value>{new base::FundamentalValue{value}};
+ return std::make_unique<base::Value>(value);
}
std::unique_ptr<base::Value> ToValue(bool value) {
- return std::unique_ptr<base::Value>{new base::FundamentalValue{value}};
+ return std::make_unique<base::Value>(value);
}
std::unique_ptr<base::Value> ToValue(double value) {
- return std::unique_ptr<base::Value>{new base::FundamentalValue{value}};
+ return std::make_unique<base::Value>(value);
}
std::unique_ptr<base::Value> ToValue(const char* value) {
- return std::unique_ptr<base::Value>{new base::StringValue{value}};
+ return std::make_unique<base::StringValue>(value);
}
std::unique_ptr<base::Value> ToValue(const std::string& value) {
- return std::unique_ptr<base::Value>{new base::StringValue{value}};
+ return std::make_unique<base::StringValue>(value);
}
} // namespace brillo