BLE - Fix qualification of abort and terminate.

pan- · pan- · commit 73f29e7733ac · 2019-02-26T13:18:18.000Z
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF51/source/nRF5xPalGattClient.tpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF51/source/nRF5xPalGattClient.tpp
@@ -168,7 +168,7 @@ nRF5xGattClient<EventHandler>::nRF5xGattClient() :
 template<class EventHandler>
 nRF5xGattClient<EventHandler>::~nRF5xGattClient()
 {
-    terminate();
+    this->terminate();
 }
 
 template<class EventHandler>
@@ -484,7 +484,7 @@ struct nRF5xGattClient<EventHandler>::RegularGattProcedure : GattProcedure {
                 do_handle(gattc_evt);
             }
         } else {
-            abort();
+            this->abort();
         }
     }
 
@@ -548,7 +548,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverPrimaryServiceProcedure : GattProc
                 handle_uuid_read(evt.evt.gattc_evt);
                 return;
             default:
-                abort();
+                this->abort();
                 return;
         }
     }
@@ -633,7 +633,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverPrimaryServiceProcedure : GattProc
     {
         response = new(std::nothrow) packed_discovery_response_t[services.size()];
         if (!response) {
-            abort();
+            this->abort();
             return;
         }
 
@@ -658,7 +658,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverPrimaryServiceProcedure : GattProc
 
         uint32_t err = sd_ble_gattc_read(connection_handle, attribute_handle, 0);
         if (err) {
-            abort();
+            this->abort();
         }
     }
 
@@ -681,7 +681,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverPrimaryServiceProcedure : GattProc
 
         if (rsp.handle != expected_handle || rsp.offset != 0 ||
             rsp.len != long_uuid_length) {
-            abort();
+            this->abort();
             return;
         }
 
@@ -844,7 +844,7 @@ struct nRF5xGattClient<EventHandler>::FindIncludedServicesProcedure : RegularGat
         size_t buffer_size = element_size * resp.count;
         uint8_t* buffer = new(std::nothrow) uint8_t[buffer_size];
         if (!buffer) {
-            abort();
+            this->abort();
             return;
         }
 
@@ -929,7 +929,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro
                 handle_uuid_read(evt.evt.gattc_evt);
                 return;
             default:
-                abort();
+                this->abort();
                 return;
         }
     }
@@ -947,7 +947,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro
         // layout the data structure into a flat byte array.
         _response = flatten_response(evt.params.char_disc_rsp);
         if (!_response.buffer) {
-            abort();
+            this->abort();
             return;
         }
 
@@ -976,7 +976,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro
 
         uint32_t err = sd_ble_gattc_read(connection_handle, attribute_handle, 0);
         if (err) {
-            abort();
+            this->abort();
         }
     }
 
@@ -990,7 +990,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro
     {
         // should never happen
         if (!_response.buffer) {
-            abort();
+            this->abort();
             return;
         }
 
@@ -1008,7 +1008,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro
 
         if (rsp.handle != expected_handle || rsp.offset != 0 ||
             rsp.len != characteristic_declaration_length) {
-            abort();
+            this->abort();
             return;
         }
 
@@ -1219,7 +1219,7 @@ struct nRF5xGattClient<EventHandler>::ReadAttributeProcedure : RegularGattProced
     {
         const ble_gattc_evt_read_rsp_t& rsp = evt.params.read_rsp;
         if (rsp.offset != 0 ) {
-            abort();
+            this->abort();
             return;
         }
 
@@ -1465,7 +1465,7 @@ struct nRF5xGattClient<EventHandler>::QueuePrepareWriteProcedure : RegularGattPr
         const ble_gattc_evt_write_rsp_t &response = evt.params.write_rsp;
 
         if (response.write_op != BLE_GATT_OP_PREP_WRITE_REQ) {
-            abort();
+            this->abort();
             return;
         }
 
@@ -1516,7 +1516,7 @@ struct nRF5xGattClient<EventHandler>::ExecuteWriteQueueProcedure : RegularGattPr
     {
         const ble_gattc_evt_write_rsp_t &response = evt.params.write_rsp;
         if (response.write_op != BLE_GATT_OP_EXEC_WRITE_REQ) {
-            abort();
+            this->abort();
             return;
         }
 
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF51/source/nRF5xPalSecurityManager.tpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF51/source/nRF5xPalSecurityManager.tpp
@@ -102,7 +102,7 @@ nRF5xSecurityManager<EventHandler>::nRF5xSecurityManager() :
 template <class EventHandler>
 nRF5xSecurityManager<EventHandler>::~nRF5xSecurityManager()
 {
-    terminate();
+    this->terminate();
 }
 
 ////////////////////////////////////////////////////////////////////////////
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xPalGattClient.tpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xPalGattClient.tpp
@@ -486,7 +486,7 @@ struct nRF5xGattClient<EventHandler>::RegularGattProcedure : GattProcedure {
                 do_handle(gattc_evt);
             }
         } else {
-            abort();
+            this->abort();
         }
     }
 
@@ -550,7 +550,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverPrimaryServiceProcedure : GattProc
                 handle_uuid_read(evt.evt.gattc_evt);
                 return;
             default:
-                abort();
+                this->abort();
                 return;
         }
     }
@@ -635,7 +635,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverPrimaryServiceProcedure : GattProc
     {
         response = new(std::nothrow) packed_discovery_response_t[services.size()];
         if (!response) {
-            abort();
+            this->abort();
             return;
         }
 
@@ -660,7 +660,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverPrimaryServiceProcedure : GattProc
 
         uint32_t err = sd_ble_gattc_read(connection_handle, attribute_handle, 0);
         if (err) {
-            abort();
+            this->abort();
         }
     }
 
@@ -683,7 +683,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverPrimaryServiceProcedure : GattProc
 
         if (rsp.handle != expected_handle || rsp.offset != 0 ||
             rsp.len != long_uuid_length) {
-            abort();
+            this->abort();
             return;
         }
 
@@ -846,7 +846,7 @@ struct nRF5xGattClient<EventHandler>::FindIncludedServicesProcedure : RegularGat
         size_t buffer_size = element_size * resp.count;
         uint8_t* buffer = new(std::nothrow) uint8_t[buffer_size];
         if (!buffer) {
-            abort();
+            this->abort();
             return;
         }
 
@@ -931,7 +931,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro
                 handle_uuid_read(evt.evt.gattc_evt);
                 return;
             default:
-                abort();
+                this->abort();
                 return;
         }
     }
@@ -949,7 +949,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro
         // layout the data structure into a flat byte array.
         _response = flatten_response(evt.params.char_disc_rsp);
         if (!_response.buffer) {
-            abort();
+            this->abort();
             return;
         }
 
@@ -978,7 +978,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro
 
         uint32_t err = sd_ble_gattc_read(connection_handle, attribute_handle, 0);
         if (err) {
-            abort();
+            this->abort();
         }
     }
 
@@ -992,7 +992,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro
     {
         // should never happen
         if (!_response.buffer) {
-            abort();
+            this->abort();
             return;
         }
 
@@ -1010,7 +1010,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro
 
         if (rsp.handle != expected_handle || rsp.offset != 0 ||
             rsp.len != characteristic_declaration_length) {
-            abort();
+            this->abort();
             return;
         }
 
@@ -1222,7 +1222,7 @@ struct nRF5xGattClient<EventHandler>::ReadAttributeProcedure : RegularGattProced
     {
         const ble_gattc_evt_read_rsp_t& rsp = evt.params.read_rsp;
         if (rsp.offset != 0 ) {
-            abort();
+            this->abort();
             return;
         }
 
@@ -1468,7 +1468,7 @@ struct nRF5xGattClient<EventHandler>::QueuePrepareWriteProcedure : RegularGattPr
         const ble_gattc_evt_write_rsp_t &response = evt.params.write_rsp;
 
         if (response.write_op != BLE_GATT_OP_PREP_WRITE_REQ) {
-            abort();
+            this->abort();
             return;
         }
 
@@ -1519,7 +1519,7 @@ struct nRF5xGattClient<EventHandler>::ExecuteWriteQueueProcedure : RegularGattPr
     {
         const ble_gattc_evt_write_rsp_t &response = evt.params.write_rsp;
         if (response.write_op != BLE_GATT_OP_EXEC_WRITE_REQ) {
-            abort();
+            this->abort();
             return;
         }
 
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xPalSecurityManager.tpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xPalSecurityManager.tpp
@@ -99,7 +99,7 @@ nRF5xSecurityManager<EventHandler>::nRF5xSecurityManager() :
 template <class EventHandler>
 nRF5xSecurityManager<EventHandler>::~nRF5xSecurityManager()
 {
-    terminate();
+    this->terminate();
 }
 
 ////////////////////////////////////////////////////////////////////////////

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ nRF5xGattClient<EventHandler>::nRF5xGattClient() :`
`168`	`168`	`template<class EventHandler>`
`169`	`169`	`nRF5xGattClient<EventHandler>::~nRF5xGattClient()`
`170`	`170`	`{`
`171`		`- terminate();`
	`171`	`+ this->terminate();`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`template<class EventHandler>`
`@@ -484,7 +484,7 @@ struct nRF5xGattClient<EventHandler>::RegularGattProcedure : GattProcedure {`
`484`	`484`	`do_handle(gattc_evt);`
`485`	`485`	`}`
`486`	`486`	`} else {`
`487`		`- abort();`
	`487`	`+ this->abort();`
`488`	`488`	`}`
`489`	`489`	`}`
`490`	`490`
`@@ -548,7 +548,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverPrimaryServiceProcedure : GattProc`
`548`	`548`	`handle_uuid_read(evt.evt.gattc_evt);`
`549`	`549`	`return;`
`550`	`550`	`default:`
`551`		`- abort();`
	`551`	`+ this->abort();`
`552`	`552`	`return;`
`553`	`553`	`}`
`554`	`554`	`}`
`@@ -633,7 +633,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverPrimaryServiceProcedure : GattProc`
`633`	`633`	`{`
`634`	`634`	`response = new(std::nothrow) packed_discovery_response_t[services.size()];`
`635`	`635`	`if (!response) {`
`636`		`- abort();`
	`636`	`+ this->abort();`
`637`	`637`	`return;`
`638`	`638`	`}`
`639`	`639`
`@@ -658,7 +658,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverPrimaryServiceProcedure : GattProc`
`658`	`658`
`659`	`659`	`uint32_t err = sd_ble_gattc_read(connection_handle, attribute_handle, 0);`
`660`	`660`	`if (err) {`
`661`		`- abort();`
	`661`	`+ this->abort();`
`662`	`662`	`}`
`663`	`663`	`}`
`664`	`664`
`@@ -681,7 +681,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverPrimaryServiceProcedure : GattProc`
`681`	`681`
`682`	`682`	`if (rsp.handle != expected_handle \|\| rsp.offset != 0 \|\|`
`683`	`683`	`rsp.len != long_uuid_length) {`
`684`		`- abort();`
	`684`	`+ this->abort();`
`685`	`685`	`return;`
`686`	`686`	`}`
`687`	`687`
`@@ -844,7 +844,7 @@ struct nRF5xGattClient<EventHandler>::FindIncludedServicesProcedure : RegularGat`
`844`	`844`	`size_t buffer_size = element_size * resp.count;`
`845`	`845`	`uint8_t* buffer = new(std::nothrow) uint8_t[buffer_size];`
`846`	`846`	`if (!buffer) {`
`847`		`- abort();`
	`847`	`+ this->abort();`
`848`	`848`	`return;`
`849`	`849`	`}`
`850`	`850`
`@@ -929,7 +929,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro`
`929`	`929`	`handle_uuid_read(evt.evt.gattc_evt);`
`930`	`930`	`return;`
`931`	`931`	`default:`
`932`		`- abort();`
	`932`	`+ this->abort();`
`933`	`933`	`return;`
`934`	`934`	`}`
`935`	`935`	`}`
`@@ -947,7 +947,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro`
`947`	`947`	`// layout the data structure into a flat byte array.`
`948`	`948`	`_response = flatten_response(evt.params.char_disc_rsp);`
`949`	`949`	`if (!_response.buffer) {`
`950`		`- abort();`
	`950`	`+ this->abort();`
`951`	`951`	`return;`
`952`	`952`	`}`
`953`	`953`
`@@ -976,7 +976,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro`
`976`	`976`
`977`	`977`	`uint32_t err = sd_ble_gattc_read(connection_handle, attribute_handle, 0);`
`978`	`978`	`if (err) {`
`979`		`- abort();`
	`979`	`+ this->abort();`
`980`	`980`	`}`
`981`	`981`	`}`
`982`	`982`
`@@ -990,7 +990,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro`
`990`	`990`	`{`
`991`	`991`	`// should never happen`
`992`	`992`	`if (!_response.buffer) {`
`993`		`- abort();`
	`993`	`+ this->abort();`
`994`	`994`	`return;`
`995`	`995`	`}`
`996`	`996`
`@@ -1008,7 +1008,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro`
`1008`	`1008`
`1009`	`1009`	`if (rsp.handle != expected_handle \|\| rsp.offset != 0 \|\|`
`1010`	`1010`	`rsp.len != characteristic_declaration_length) {`
`1011`		`- abort();`
	`1011`	`+ this->abort();`
`1012`	`1012`	`return;`
`1013`	`1013`	`}`
`1014`	`1014`
`@@ -1219,7 +1219,7 @@ struct nRF5xGattClient<EventHandler>::ReadAttributeProcedure : RegularGattProced`
`1219`	`1219`	`{`
`1220`	`1220`	`const ble_gattc_evt_read_rsp_t& rsp = evt.params.read_rsp;`
`1221`	`1221`	`if (rsp.offset != 0 ) {`
`1222`		`- abort();`
	`1222`	`+ this->abort();`
`1223`	`1223`	`return;`
`1224`	`1224`	`}`
`1225`	`1225`
`@@ -1465,7 +1465,7 @@ struct nRF5xGattClient<EventHandler>::QueuePrepareWriteProcedure : RegularGattPr`
`1465`	`1465`	`const ble_gattc_evt_write_rsp_t &response = evt.params.write_rsp;`
`1466`	`1466`
`1467`	`1467`	`if (response.write_op != BLE_GATT_OP_PREP_WRITE_REQ) {`
`1468`		`- abort();`
	`1468`	`+ this->abort();`
`1469`	`1469`	`return;`
`1470`	`1470`	`}`
`1471`	`1471`
`@@ -1516,7 +1516,7 @@ struct nRF5xGattClient<EventHandler>::ExecuteWriteQueueProcedure : RegularGattPr`
`1516`	`1516`	`{`
`1517`	`1517`	`const ble_gattc_evt_write_rsp_t &response = evt.params.write_rsp;`
`1518`	`1518`	`if (response.write_op != BLE_GATT_OP_EXEC_WRITE_REQ) {`
`1519`		`- abort();`
	`1519`	`+ this->abort();`
`1520`	`1520`	`return;`
`1521`	`1521`	`}`
`1522`	`1522`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ nRF5xSecurityManager<EventHandler>::nRF5xSecurityManager() :`
`102`	`102`	`template <class EventHandler>`
`103`	`103`	`nRF5xSecurityManager<EventHandler>::~nRF5xSecurityManager()`
`104`	`104`	`{`
`105`		`- terminate();`
	`105`	`+ this->terminate();`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`////////////////////////////////////////////////////////////////////////////`
Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,7 @@ struct nRF5xGattClient<EventHandler>::RegularGattProcedure : GattProcedure {`
`486`	`486`	`do_handle(gattc_evt);`
`487`	`487`	`}`
`488`	`488`	`} else {`
`489`		`- abort();`
	`489`	`+ this->abort();`
`490`	`490`	`}`
`491`	`491`	`}`
`492`	`492`
`@@ -550,7 +550,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverPrimaryServiceProcedure : GattProc`
`550`	`550`	`handle_uuid_read(evt.evt.gattc_evt);`
`551`	`551`	`return;`
`552`	`552`	`default:`
`553`		`- abort();`
	`553`	`+ this->abort();`
`554`	`554`	`return;`
`555`	`555`	`}`
`556`	`556`	`}`
`@@ -635,7 +635,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverPrimaryServiceProcedure : GattProc`
`635`	`635`	`{`
`636`	`636`	`response = new(std::nothrow) packed_discovery_response_t[services.size()];`
`637`	`637`	`if (!response) {`
`638`		`- abort();`
	`638`	`+ this->abort();`
`639`	`639`	`return;`
`640`	`640`	`}`
`641`	`641`
`@@ -660,7 +660,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverPrimaryServiceProcedure : GattProc`
`660`	`660`
`661`	`661`	`uint32_t err = sd_ble_gattc_read(connection_handle, attribute_handle, 0);`
`662`	`662`	`if (err) {`
`663`		`- abort();`
	`663`	`+ this->abort();`
`664`	`664`	`}`
`665`	`665`	`}`
`666`	`666`
`@@ -683,7 +683,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverPrimaryServiceProcedure : GattProc`
`683`	`683`
`684`	`684`	`if (rsp.handle != expected_handle \|\| rsp.offset != 0 \|\|`
`685`	`685`	`rsp.len != long_uuid_length) {`
`686`		`- abort();`
	`686`	`+ this->abort();`
`687`	`687`	`return;`
`688`	`688`	`}`
`689`	`689`
`@@ -846,7 +846,7 @@ struct nRF5xGattClient<EventHandler>::FindIncludedServicesProcedure : RegularGat`
`846`	`846`	`size_t buffer_size = element_size * resp.count;`
`847`	`847`	`uint8_t* buffer = new(std::nothrow) uint8_t[buffer_size];`
`848`	`848`	`if (!buffer) {`
`849`		`- abort();`
	`849`	`+ this->abort();`
`850`	`850`	`return;`
`851`	`851`	`}`
`852`	`852`
`@@ -931,7 +931,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro`
`931`	`931`	`handle_uuid_read(evt.evt.gattc_evt);`
`932`	`932`	`return;`
`933`	`933`	`default:`
`934`		`- abort();`
	`934`	`+ this->abort();`
`935`	`935`	`return;`
`936`	`936`	`}`
`937`	`937`	`}`
`@@ -949,7 +949,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro`
`949`	`949`	`// layout the data structure into a flat byte array.`
`950`	`950`	`_response = flatten_response(evt.params.char_disc_rsp);`
`951`	`951`	`if (!_response.buffer) {`
`952`		`- abort();`
	`952`	`+ this->abort();`
`953`	`953`	`return;`
`954`	`954`	`}`
`955`	`955`
`@@ -978,7 +978,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro`
`978`	`978`
`979`	`979`	`uint32_t err = sd_ble_gattc_read(connection_handle, attribute_handle, 0);`
`980`	`980`	`if (err) {`
`981`		`- abort();`
	`981`	`+ this->abort();`
`982`	`982`	`}`
`983`	`983`	`}`
`984`	`984`
`@@ -992,7 +992,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro`
`992`	`992`	`{`
`993`	`993`	`// should never happen`
`994`	`994`	`if (!_response.buffer) {`
`995`		`- abort();`
	`995`	`+ this->abort();`
`996`	`996`	`return;`
`997`	`997`	`}`
`998`	`998`
`@@ -1010,7 +1010,7 @@ struct nRF5xGattClient<EventHandler>::DiscoverCharacteristicsProcedure : GattPro`
`1010`	`1010`
`1011`	`1011`	`if (rsp.handle != expected_handle \|\| rsp.offset != 0 \|\|`
`1012`	`1012`	`rsp.len != characteristic_declaration_length) {`
`1013`		`- abort();`
	`1013`	`+ this->abort();`
`1014`	`1014`	`return;`
`1015`	`1015`	`}`
`1016`	`1016`
`@@ -1222,7 +1222,7 @@ struct nRF5xGattClient<EventHandler>::ReadAttributeProcedure : RegularGattProced`
`1222`	`1222`	`{`
`1223`	`1223`	`const ble_gattc_evt_read_rsp_t& rsp = evt.params.read_rsp;`
`1224`	`1224`	`if (rsp.offset != 0 ) {`
`1225`		`- abort();`
	`1225`	`+ this->abort();`
`1226`	`1226`	`return;`
`1227`	`1227`	`}`
`1228`	`1228`
`@@ -1468,7 +1468,7 @@ struct nRF5xGattClient<EventHandler>::QueuePrepareWriteProcedure : RegularGattPr`
`1468`	`1468`	`const ble_gattc_evt_write_rsp_t &response = evt.params.write_rsp;`
`1469`	`1469`
`1470`	`1470`	`if (response.write_op != BLE_GATT_OP_PREP_WRITE_REQ) {`
`1471`		`- abort();`
	`1471`	`+ this->abort();`
`1472`	`1472`	`return;`
`1473`	`1473`	`}`
`1474`	`1474`
`@@ -1519,7 +1519,7 @@ struct nRF5xGattClient<EventHandler>::ExecuteWriteQueueProcedure : RegularGattPr`
`1519`	`1519`	`{`
`1520`	`1520`	`const ble_gattc_evt_write_rsp_t &response = evt.params.write_rsp;`
`1521`	`1521`	`if (response.write_op != BLE_GATT_OP_EXEC_WRITE_REQ) {`
`1522`		`- abort();`
	`1522`	`+ this->abort();`
`1523`	`1523`	`return;`
`1524`	`1524`	`}`
`1525`	`1525`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ nRF5xSecurityManager<EventHandler>::nRF5xSecurityManager() :`
`99`	`99`	`template <class EventHandler>`
`100`	`100`	`nRF5xSecurityManager<EventHandler>::~nRF5xSecurityManager()`
`101`	`101`	`{`
`102`		`- terminate();`
	`102`	`+ this->terminate();`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`////////////////////////////////////////////////////////////////////////////`