diff options
| author | Alex Vakulenko <avakulenko@google.com> | 2016-03-28 15:41:49 -0700 |
|---|---|---|
| committer | Alex Vakulenko <avakulenko@google.com> | 2016-03-29 15:05:55 +0000 |
| commit | 38a2aef3d483ef9bd73989a0a25a636a7d03cad9 (patch) | |
| tree | e334ff22c7d5bb72653a3ee97918658b5f030361 /examples | |
| parent | bf79a9eb710d8c9df6ab3e5e305ff6c881a19ab2 (diff) | |
| download | libweave-38a2aef3d483ef9bd73989a0a25a636a7d03cad9.tar.gz | |
libweave: Remove release() calls on scoped_ptr
Now that scoped_ptr is just a type alias to std::unique_ptr, there
is no need to do release()/aquire semantics to convert between
scoped_ptr and unique_ptr. Also, replaced base::Value::DeepCopy with
the safer smart-pointer-enabled base::Value::CreateDeepCopy.
Change-Id: I6b7ed78b3fae6d42a68b7d73ae4d9d5eebf48922
Reviewed-on: https://weave-review.googlesource.com/3067
Reviewed-by: Robert Ginda <rginda@google.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/daemon/light/light.cc | 2 | ||||
| -rw-r--r-- | examples/daemon/oven/oven.cc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/examples/daemon/light/light.cc b/examples/daemon/light/light.cc index 07c0231..66167b4 100644 --- a/examples/daemon/light/light.cc +++ b/examples/daemon/light/light.cc @@ -288,7 +288,7 @@ class LightHandler { std::unique_ptr<base::DictionaryValue> colorXy(new base::DictionaryValue()); colorXy->SetDouble("colorX", color_X_); colorXy->SetDouble("colorY", color_Y_); - state.Set("colorXy.colorSetting", colorXy.release()); + state.Set("colorXy.colorSetting", std::move(colorXy)); device_->SetStateProperties(kComponent, state, nullptr); } diff --git a/examples/daemon/oven/oven.cc b/examples/daemon/oven/oven.cc index daf1971..f92c838 100644 --- a/examples/daemon/oven/oven.cc +++ b/examples/daemon/oven/oven.cc @@ -227,11 +227,13 @@ class OvenHandler { state.SetString("temperatureSensor.units", units_); state.SetDouble("temperatureSensor.value", current_temperature_); - state.Set("temperatureSensor.supportedUnits", supportedUnits.DeepCopy()); + state.Set("temperatureSensor.supportedUnits", + supportedUnits.CreateDeepCopy()); state.SetString("temperatureSetting.units", units_); state.SetDouble("temperatureSetting.tempSetting", target_temperature_); - state.Set("temperatureSetting.supportedUnits", supportedUnits.DeepCopy()); + state.Set("temperatureSetting.supportedUnits", + supportedUnits.CreateDeepCopy()); state.SetDouble("temperatureSetting.maxTempSetting", kMaxTemp); state.SetDouble("temperatureSetting.minTempSetting", kMinTemp); |