From f9e3310179ba6b9d71c8535e03fd88eeb1eed334 Mon Sep 17 00:00:00 2001 From: "Piotr Kosko/Tizen API (PLT) /SRPOL/Engineer/Samsung Electronics" Date: Thu, 16 Jan 2025 08:18:45 +0100 Subject: [PATCH] Change to c++17 and fix issues [Verification] Code compiles without errors for armv7l and aarch64 Change-Id: I4cd17f4f2c90f44583ff93a179a35fc0f7b1e934 --- src/bluetooth/bluetooth_le_adapter.cc | 4 ++-- src/common/common.gypi | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bluetooth/bluetooth_le_adapter.cc b/src/bluetooth/bluetooth_le_adapter.cc index bbd7f3c5..55839091 100644 --- 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 Construct(const picojson::value& service_data_obj) { + static common::optional 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 c20c5bc3..2763ebee 100644 --- 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' : [ -- 2.34.1