commit 46cfa3e0395a184a093f250edbe8e2977c8a9da7
author Vitaly Buka <vitalybuka@chromium.org> Thu Aug 20 22:43:53 2015 -0700
committer Alex Vakulenko <avakulenko@google.com> Mon Aug 24 07:32:47 2015 -0700
tree 0403c76a072fdf633c6666f905e6001886bb7a84
parent 11b2f2382db08ce26f4c4875a4e2d77586165720

libweave: Fix gcc 4.8.4 build

Previous failed with error:
‘weave::Config::Config(const weave::Config&)’ is private
Seems like a bug in compiler.

BUG=none
TEST=none

Change-Id: Iec0f59450a5b71d1c9185e51d4352e8bc286e05c
Reviewed-on: https://chromium-review.googlesource.com/294873
Reviewed-by: Vitaly Buka <vitalybuka@chromium.org>
Tested-by: Vitaly Buka <vitalybuka@chromium.org>
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>

libweave/src/base_api_handler.cc

diff --git a/libweave/src/base_api_handler.cc b/libweave/src/base_api_handler.cc
index b9e4de4..f05deff 100644
--- a/libweave/src/base_api_handler.cc
+++ b/libweave/src/base_api_handler.cc
@@ -28,7 +28,7 @@
   device_info_->AddOnConfigChangedCallback(base::Bind(
       &BaseApiHandler::OnConfigChanged, weak_ptr_factory_.GetWeakPtr()));
 
-  const Config& config{device_info_->GetConfig()};
+  const Config& config = device_info_->GetConfig();
   base::DictionaryValue state;
   state.SetStringWithoutPathExpansion(kBaseStateFirmwareVersion,
                                       config.firmware_version());
@@ -52,7 +52,7 @@
 void BaseApiHandler::UpdateBaseConfiguration(Command* command) {
   command->SetProgress(base::DictionaryValue{}, nullptr);
 
-  const Config& config{device_info_->GetConfig()};
+  const Config& config = device_info_->GetConfig();
   std::string anonymous_access_role{config.local_anonymous_access_role()};
   bool discovery_enabled{config.local_discovery_enabled()};
   bool pairing_enabled{config.local_pairing_enabled()};
@@ -84,7 +84,7 @@
 void BaseApiHandler::UpdateDeviceInfo(Command* command) {
   command->SetProgress(base::DictionaryValue{}, nullptr);
 
-  const Config& config{device_info_->GetConfig()};
+  const Config& config = device_info_->GetConfig();
   std::string name{config.name()};
   std::string description{config.description()};
   std::string location{config.location()};

libweave/src/base_api_handler_unittest.cc

diff --git a/libweave/src/base_api_handler_unittest.cc b/libweave/src/base_api_handler_unittest.cc
index 7ffc3d9..d3b5281 100644
--- a/libweave/src/base_api_handler_unittest.cc
+++ b/libweave/src/base_api_handler_unittest.cc
@@ -115,7 +115,7 @@
     }
   })");
 
-  Config& config{*dev_reg_->GetMutableConfig()};
+  Config& config = *dev_reg_->GetMutableConfig();
 
   AddCommand(R"({
     'name' : 'base.updateBaseConfiguration',
@@ -204,7 +204,7 @@
     }
   })");
 
-  const Config& config{dev_reg_->GetConfig()};
+  const Config& config = dev_reg_->GetConfig();
   EXPECT_EQ("testName", config.name());
   EXPECT_EQ("testDescription", config.description());
   EXPECT_EQ("testLocation", config.location());