From 6f186adc6ab5953f587db70e0399cafdd10cbb90 Mon Sep 17 00:00:00 2001 From: Szymon Jastrzebski Date: Thu, 16 Feb 2017 12:59:45 +0100 Subject: [PATCH] [Bluetooth] Fixing initialization order Change-Id: I83a2b3b265dc69c203b98c7314501be5a2e23c3a Signed-off-by: Szymon Jastrzebski --- src/bluetooth/bluetooth_instance.cc | 2 +- src/bluetooth/bluetooth_instance.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bluetooth/bluetooth_instance.cc b/src/bluetooth/bluetooth_instance.cc index 322f45f4..158555fa 100755 --- a/src/bluetooth/bluetooth_instance.cc +++ b/src/bluetooth/bluetooth_instance.cc @@ -29,9 +29,9 @@ using namespace common; BluetoothInstance::BluetoothInstance() : bluetooth_adapter_(*this), bluetooth_device_(bluetooth_adapter_), - bluetooth_health_application_(bluetooth_health_profile_handler_), bluetooth_health_channel_(), bluetooth_health_profile_handler_(*this), + bluetooth_health_application_(bluetooth_health_profile_handler_), bluetooth_service_handler_(bluetooth_adapter_), bluetooth_socket_(bluetooth_adapter_), bluetooth_le_adapter_(*this), diff --git a/src/bluetooth/bluetooth_instance.h b/src/bluetooth/bluetooth_instance.h index daeabefd..30bb4cf3 100755 --- a/src/bluetooth/bluetooth_instance.h +++ b/src/bluetooth/bluetooth_instance.h @@ -50,9 +50,9 @@ class BluetoothInstance: public common::ParsedInstance { private: BluetoothAdapter bluetooth_adapter_; BluetoothDevice bluetooth_device_; - BluetoothHealthApplication bluetooth_health_application_; BluetoothHealthChannel bluetooth_health_channel_; BluetoothHealthProfileHandler bluetooth_health_profile_handler_; + BluetoothHealthApplication bluetooth_health_application_; BluetoothServiceHandler bluetooth_service_handler_; BluetoothSocket bluetooth_socket_; BluetoothLEAdapter bluetooth_le_adapter_; -- 2.34.1