diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-05-22 01:09:30 +0200 |
|---|---|---|
| committer | Patrik Ryd <patrik.ryd@linaro.org> | 2012-06-11 15:42:50 +0200 |
| commit | 39f93142d638913092374f628a500d2c87672c05 (patch) | |
| tree | b64bed1298e6b7c521fb8cc73a860e974d5f0af4 | |
| parent | 76b0a345901c55f6ab48f08b10177dfd0140feee (diff) | |
| download | base-39f93142d638913092374f628a500d2c87672c05.tar.gz | |
BluetoothEventLoop: Fix build in ISO C++11 mode
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
(cherry picked from commit 53def647d1abe2ef0ba76c43d76ecc2b7dd89d03)
Change-Id: I16655047431bb2713243bde69261d402c0fa07af
| -rw-r--r-- | core/jni/android_server_BluetoothEventLoop.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/core/jni/android_server_BluetoothEventLoop.cpp b/core/jni/android_server_BluetoothEventLoop.cpp index e8933fe59f5d..3581816389be 100644 --- a/core/jni/android_server_BluetoothEventLoop.cpp +++ b/core/jni/android_server_BluetoothEventLoop.cpp @@ -254,35 +254,35 @@ static jboolean setUpEventLoop(native_data_t *nat) { return JNI_FALSE; } dbus_bus_add_match(nat->conn, - "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".Adapter'", + "type='signal',interface='" BLUEZ_DBUS_BASE_IFC ".Adapter'", &err); if (dbus_error_is_set(&err)) { LOG_AND_FREE_DBUS_ERROR(&err); return JNI_FALSE; } dbus_bus_add_match(nat->conn, - "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".Device'", + "type='signal',interface='" BLUEZ_DBUS_BASE_IFC ".Device'", &err); if (dbus_error_is_set(&err)) { LOG_AND_FREE_DBUS_ERROR(&err); return JNI_FALSE; } dbus_bus_add_match(nat->conn, - "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".Input'", + "type='signal',interface='" BLUEZ_DBUS_BASE_IFC ".Input'", &err); if (dbus_error_is_set(&err)) { LOG_AND_FREE_DBUS_ERROR(&err); return JNI_FALSE; } dbus_bus_add_match(nat->conn, - "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".Network'", + "type='signal',interface='" BLUEZ_DBUS_BASE_IFC ".Network'", &err); if (dbus_error_is_set(&err)) { LOG_AND_FREE_DBUS_ERROR(&err); return JNI_FALSE; } dbus_bus_add_match(nat->conn, - "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".NetworkServer'", + "type='signal',interface='" BLUEZ_DBUS_BASE_IFC ".NetworkServer'", &err); if (dbus_error_is_set(&err)) { LOG_AND_FREE_DBUS_ERROR(&err); @@ -290,7 +290,7 @@ static jboolean setUpEventLoop(native_data_t *nat) { } dbus_bus_add_match(nat->conn, - "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".HealthDevice'", + "type='signal',interface='" BLUEZ_DBUS_BASE_IFC ".HealthDevice'", &err); if (dbus_error_is_set(&err)) { LOG_AND_FREE_DBUS_ERROR(&err); @@ -449,37 +449,37 @@ static void tearDownEventLoop(native_data_t *nat) { dbus_connection_unregister_object_path(nat->conn, agent_path); dbus_bus_remove_match(nat->conn, - "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".AudioSink'", + "type='signal',interface='" BLUEZ_DBUS_BASE_IFC ".AudioSink'", &err); if (dbus_error_is_set(&err)) { LOG_AND_FREE_DBUS_ERROR(&err); } dbus_bus_remove_match(nat->conn, - "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".Device'", + "type='signal',interface='" BLUEZ_DBUS_BASE_IFC ".Device'", &err); if (dbus_error_is_set(&err)) { LOG_AND_FREE_DBUS_ERROR(&err); } dbus_bus_remove_match(nat->conn, - "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".Input'", + "type='signal',interface='" BLUEZ_DBUS_BASE_IFC ".Input'", &err); if (dbus_error_is_set(&err)) { LOG_AND_FREE_DBUS_ERROR(&err); } dbus_bus_remove_match(nat->conn, - "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".Network'", + "type='signal',interface='" BLUEZ_DBUS_BASE_IFC ".Network'", &err); if (dbus_error_is_set(&err)) { LOG_AND_FREE_DBUS_ERROR(&err); } dbus_bus_remove_match(nat->conn, - "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".NetworkServer'", + "type='signal',interface='" BLUEZ_DBUS_BASE_IFC ".NetworkServer'", &err); if (dbus_error_is_set(&err)) { LOG_AND_FREE_DBUS_ERROR(&err); } dbus_bus_remove_match(nat->conn, - "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".HealthDevice'", + "type='signal',interface='" BLUEZ_DBUS_BASE_IFC ".HealthDevice'", &err); if (dbus_error_is_set(&err)) { LOG_AND_FREE_DBUS_ERROR(&err); @@ -491,7 +491,7 @@ static void tearDownEventLoop(native_data_t *nat) { LOG_AND_FREE_DBUS_ERROR(&err); } dbus_bus_remove_match(nat->conn, - "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".Adapter'", + "type='signal',interface='" BLUEZ_DBUS_BASE_IFC ".Adapter'", &err); if (dbus_error_is_set(&err)) { LOG_AND_FREE_DBUS_ERROR(&err); |