From e33f72e932661784affc0f24d56f0e78fbac783f Mon Sep 17 00:00:00 2001 From: christian linke Date: Mon, 22 Oct 2012 17:26:53 +0200 Subject: * make RoutingSender DBus compile with 0xC11 Signed-off-by: christian linke --- AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp | 2 +- .../src/CAmRoutingSenderDbus.cpp | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp index 0c4206a..d820351 100644 --- a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp +++ b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp @@ -124,7 +124,7 @@ void CAmTelnetMenuHelper::newSocketConnection(int filedescriptor) } it = mCurrentMainStateMap.begin(); // insert new socket connection - mCurrentMainStateMap.insert(it, std::make_pair(filedescriptor, state)); + mCurrentMainStateMap.insert(it, std::make_pair(filedescriptor, state)); // Send welcome message welcome << COLOR_WELCOME << "Welcome to GENIVI AudioManager " << DAEMONVERSION << COLOR_DEFAULT << "\n>"; send(filedescriptor, welcome.str().c_str(), welcome.str().size(), 0); diff --git a/PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp b/PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp index 67d487d..8784c07 100644 --- a/PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp +++ b/PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp @@ -118,7 +118,7 @@ am_Error_e CAmRoutingSenderDbus::asyncConnect(const am_Handle_s handle, const am send.append(sinkID); send.append(static_cast(connectionFormat)); mMapConnections.insert(std::make_pair(connectionID, (iter->second))); - mMapHandles.insert(std::make_pair(handle.handle, iter->second)); + mMapHandles.insert(std::make_pair(+handle.handle, iter->second)); return (send.send()); } log(&routingDbus, DLT_LOG_ERROR, "CAmRoutingSenderDbus::asyncConnect could not find interface"); @@ -135,7 +135,7 @@ am_Error_e CAmRoutingSenderDbus::asyncDisconnect(const am_Handle_s handle, const CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, "asyncDisconnect"); send.append(handle.handle); send.append(connectionID); - mMapHandles.insert(std::make_pair(handle.handle, iter->second)); + mMapHandles.insert(std::make_pair(+handle.handle, iter->second)); return (send.send()); } log(&routingDbus, DLT_LOG_ERROR, "CAmRoutingSenderDbus::asyncDisconnect could not find interface"); @@ -155,7 +155,7 @@ am_Error_e CAmRoutingSenderDbus::asyncSetSinkVolume(const am_Handle_s handle, co send.append(volume); send.append(static_cast(ramp)); send.append(time); - mMapHandles.insert(std::make_pair(handle.handle, iter->second)); + mMapHandles.insert(std::make_pair(+handle.handle, iter->second)); return (send.send()); } log(&routingDbus, DLT_LOG_ERROR, "CAmRoutingSenderDbus::asyncSetSinkVolume could not find interface"); @@ -175,7 +175,7 @@ am_Error_e CAmRoutingSenderDbus::asyncSetSourceVolume(const am_Handle_s handle, send.append(volume); send.append(static_cast(ramp)); send.append(time); - mMapHandles.insert(std::make_pair(handle.handle, iter->second)); + mMapHandles.insert(std::make_pair(+handle.handle, iter->second)); return (send.send()); } log(&routingDbus, DLT_LOG_ERROR, "CAmRoutingSenderDbus::asyncSetSourceVolume could not find interface"); @@ -193,7 +193,7 @@ am_Error_e CAmRoutingSenderDbus::asyncSetSourceState(const am_Handle_s handle, c send.append(handle.handle); send.append(sourceID); send.append(static_cast(state)); - mMapHandles.insert(std::make_pair(handle.handle, iter->second)); + mMapHandles.insert(std::make_pair(+handle.handle, iter->second)); return (send.send()); } log(&routingDbus, DLT_LOG_ERROR, "CAmRoutingSenderDbus::asyncSetSourceState could not find interface"); @@ -211,7 +211,7 @@ am_Error_e CAmRoutingSenderDbus::asyncSetSinkSoundProperties(const am_Handle_s h send.append(handle.handle); send.append(sinkID); send.append(listSoundProperties); - mMapHandles.insert(std::make_pair(handle.handle, iter->second)); + mMapHandles.insert(std::make_pair(+handle.handle, iter->second)); return (send.send()); } log(&routingDbus, DLT_LOG_ERROR, "CAmRoutingSenderDbus::asyncSetSinkSoundProperties could not find interface"); @@ -229,7 +229,7 @@ am_Error_e CAmRoutingSenderDbus::asyncSetSinkSoundProperty(const am_Handle_s han send.append(handle.handle); send.append(sinkID); send.append(soundProperty); - mMapHandles.insert(std::make_pair(handle.handle, iter->second)); + mMapHandles.insert(std::make_pair(+handle.handle, iter->second)); return (send.send()); } log(&routingDbus, DLT_LOG_ERROR, "CAmRoutingSenderDbus::asyncSetSinkSoundProperty could not find interface"); @@ -247,7 +247,7 @@ am_Error_e CAmRoutingSenderDbus::asyncSetSourceSoundProperties(const am_Handle_s send.append(handle.handle); send.append(sourceID); send.append(listSoundProperties); - mMapHandles.insert(std::make_pair(handle.handle, iter->second)); + mMapHandles.insert(std::make_pair(+handle.handle, iter->second)); return (send.send()); } log(&routingDbus, DLT_LOG_ERROR, "CAmRoutingSenderDbus::asyncSetSourceSoundProperties could not find interface"); @@ -265,7 +265,7 @@ am_Error_e CAmRoutingSenderDbus::asyncSetSourceSoundProperty(const am_Handle_s h send.append(handle.handle); send.append(sourceID); send.append(soundProperty); - mMapHandles.insert(std::make_pair(handle.handle, iter->second)); + mMapHandles.insert(std::make_pair(+handle.handle, iter->second)); return (send.send()); } log(&routingDbus, DLT_LOG_ERROR, "CAmRoutingSenderDbus::asyncSetSourceSoundProperty could not find interface"); -- cgit v1.2.1