Diff: source/nRF5xGattClient.cpp

Revision:

417:d79a89cccddd

Parent:

416:5b7d26035f2b

Child:

418:d66d5957a220

diff -r 5b7d26035f2b -r d79a89cccddd source/nRF5xGattClient.cpp
--- a/source/nRF5xGattClient.cpp	Tue Aug 11 15:14:23 2015 +0100
+++ b/source/nRF5xGattClient.cpp	Tue Aug 11 15:14:23 2015 +0100
@@ -16,14 +16,12 @@
 
 #include "nRF5xGattClient.h"
 
-nRF5xGattClient nRFGattClientSingleton;
-
 nRF5xGattClient &
 nRF5xGattClient::getInstance(void) {
+    static nRF5xGattClient nRFGattClientSingleton;
     return nRFGattClientSingleton;
 }
 
-#if !defined(MCU_NORDIC_16K_S110) && !defined(MCU_NORDIC_32K_S110)
 ble_error_t
 nRF5xGattClient::launchServiceDiscovery(Gap::Handle_t                               connectionHandle,
                                         ServiceDiscovery::ServiceCallback_t         sc,
@@ -32,5 +30,4 @@
                                         const UUID                                 &matchingCharacteristicUUIDIn)
 {
     return discovery.launch(connectionHandle, sc, cc, matchingServiceUUIDIn, matchingCharacteristicUUIDIn);
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file