michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Fix usage of C++ reserved word

Browse source 
'private' is a C++ reserved word and will lead to compilation errors:

  C++     ble.o
In file included from ble.cpp:7:0:
 include/bluetooth/bluetooth.h:284:10: error: expected unqualified-id before 'private'
  uint8_t private[4];

Change-Id: I36aef5a84af4fc66e1c810bd0c56e5ab5f803294
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2016-11-08 12:21:46 +02:00
commit 195e1b89b1
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/bluetooth/bluetooth.h
View file

@ -281,7 +281,7 @@ int bt_le_oob_get_local(struct bt_le_oob *oob);
/** @brief BR/EDR discovery result structure */
struct bt_br_discovery_result {
/** private */
uint8_t private[4];
uint8_t _priv[4];
/** Remote device address */
bt_addr_t addr;

12
subsys/bluetooth/host/hci_core.c
View file

@ -1578,7 +1578,7 @@ static void report_discovery_results(void)
for (i = 0; i < discovery_results_count; i++) {
struct discovery_priv *priv;
priv = (struct discovery_priv *)&discovery_results[i].private;
priv = (struct discovery_priv *)&discovery_results[i]._priv;
if (eir_has_name(discovery_results[i].eir)) {
continue;
@ -1673,7 +1673,7 @@ static void inquiry_result_with_rssi(struct net_buf *buf)
return;
}
priv = (struct discovery_priv *)&result->private;
priv = (struct discovery_priv *)&result->_priv;
priv->pscan_rep_mode = evt->pscan_rep_mode;
priv->clock_offset = evt->clock_offset;
@ -1705,7 +1705,7 @@ static void extended_inquiry_result(struct net_buf *buf)
return;
}
priv = (struct discovery_priv *)&result->private;
priv = (struct discovery_priv *)&result->_priv;
priv->pscan_rep_mode = evt->pscan_rep_mode;
priv->clock_offset = evt->clock_offset;
@ -1728,7 +1728,7 @@ static void remote_name_request_complete(struct net_buf *buf)
return;
}
priv = (struct discovery_priv *)&result->private;
priv = (struct discovery_priv *)&result->_priv;
priv->resolving = 0;
if (evt->status) {
@ -1779,7 +1779,7 @@ check_names:
for (i = 0; i < discovery_results_count; i++) {
struct discovery_priv *priv;
priv = (struct discovery_priv *)&discovery_results[i].private;
priv = (struct discovery_priv *)&discovery_results[i]._priv;
if (priv->resolving) {
return;
@ -4087,7 +4087,7 @@ int bt_br_discovery_stop(void)
struct bt_hci_cp_remote_name_cancel *cp;
struct net_buf *buf;
priv = (struct discovery_priv *)&discovery_results[i].private;
priv = (struct discovery_priv *)&discovery_results[i]._priv;
if (!priv->resolving) {
continue;