Change to c++17 and fix issues

[Verification] Code compiles without errors for armv7l and aarch64

Change-Id: I4cd17f4f2c90f44583ff93a179a35fc0f7b1e934

diff --git a/src/bluetooth/bluetooth_le_adapter.cc b/src/bluetooth/bluetooth_le_adapter.cc
index bbd7f3c5a3067f53bcccb6ead3d00c9c27b3a999..558390915fbbe78a63e9dfa4d7434d67704ac274 100644 (file)
--- a/src/bluetooth/bluetooth_le_adapter.cc
+++ b/src/bluetooth/bluetooth_le_adapter.cc
@@ -17,13 +17,13 @@
 #include "bluetooth/bluetooth_le_adapter.h"
 
 #include "common/logger.h"
+#include "common/optional.h"
 #include "common/tools.h"
 
 #include "bluetooth/bluetooth_instance.h"
 #include "bluetooth/bluetooth_le_device.h"
 #include "bluetooth/bluetooth_privilege.h"
 #include "bluetooth/bluetooth_util.h"
-using common::optional;
 
 namespace extension {
 namespace bluetooth {
@@ -100,7 +100,7 @@ class BluetoothLEServiceData : public ParsedDataHolder {
     return data_;
   }
 
-  static optional<BluetoothLEServiceData> Construct(const picojson::value& service_data_obj) {
+  static common::optional<BluetoothLEServiceData> Construct(const picojson::value& service_data_obj) {
     ScopeLogger();
 
     const auto& data = service_data_obj.get(kData);

diff --git a/src/common/common.gypi b/src/common/common.gypi
index c20c5bc32d68303b1f9e419fb12e7135728638b3..2763ebeef33aa0e358a375f0b87881a0894bf9d0 100644 (file)
--- a/src/common/common.gypi
+++ b/src/common/common.gypi
@@ -91,7 +91,7 @@
       '-std=c11',
     ],
     'cflags_cc': [
-      '-std=c++14',
+      '-std=c++17',
       '-Wno-unused-result',
     ],
     'libraries' : [