diff options
author | Brad Pankow <brad@livio.io> | 2016-09-02 11:39:53 -0400 |
---|---|---|
committer | Jacob Keeler <jacob@livio.io> | 2016-08-11 15:40:49 -0700 |
commit | 77e94b35329798f2a08cd31b7667c3d13150e2db (patch) | |
tree | 5e28d945db72fb5e2f826f77873a87ba7ec6b955 | |
parent | cafed909b10654e34d0908019f05a92166846ec2 (diff) | |
download | sdl_core-77e94b35329798f2a08cd31b7667c3d13150e2db.tar.gz |
Remove log-specific variables for ENABLE_LOG = 0
-rw-r--r-- | src/components/application_manager/src/resumption/resume_ctrl.cc | 6 | ||||
-rw-r--r-- | src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/components/application_manager/src/resumption/resume_ctrl.cc b/src/components/application_manager/src/resumption/resume_ctrl.cc index 5e24c5572c..16007ba11a 100644 --- a/src/components/application_manager/src/resumption/resume_ctrl.cc +++ b/src/components/application_manager/src/resumption/resume_ctrl.cc @@ -658,7 +658,6 @@ bool ResumeCtrl::CheckAppRestrictions( LOG4CXX_AUTO_TRACE(logger_); DCHECK_OR_RETURN(saved_app.keyExists(strings::hmi_level), false); - const bool is_media_app = application->is_media_application(); const HMILevel::eType hmi_level = static_cast<HMILevel::eType>(saved_app[strings::hmi_level].asInt()); const bool result = Compare<HMILevel::eType, EQ, ONE>( @@ -666,8 +665,9 @@ bool ResumeCtrl::CheckAppRestrictions( ? true : false; LOG4CXX_DEBUG(logger_, - "is_media_app " << is_media_app << "; hmi_level " << hmi_level - << " result " << result); + "is_media_app " << application->is_media_application() + << "; hmi_level " << hmi_level << " result " + << result); return result; } diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc index 5638eecdee..2d0d9b91d4 100644 --- a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc +++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc @@ -751,21 +751,20 @@ void TransportAdapterImpl::ConnectFailed(const DeviceUID& device_handle, void TransportAdapterImpl::RemoveFinalizedConnection( const DeviceUID& device_handle, const ApplicationHandle& app_handle) { const DeviceUID device_uid = device_handle; - const ApplicationHandle app_uid = app_handle; LOG4CXX_AUTO_TRACE(logger_); sync_primitives::AutoWriteLock lock(connections_lock_); ConnectionMap::iterator it_conn = connections_.find(std::make_pair(device_uid, app_handle)); if (it_conn == connections_.end()) { LOG4CXX_WARN(logger_, - "Device_id: " << &device_uid << ", app_handle: " << &app_uid + "Device_id: " << &device_uid << ", app_handle: " << &app_handle << " connection not found"); return; } const ConnectionInfo& info = it_conn->second; if (info.state != ConnectionInfo::FINALISING) { LOG4CXX_WARN(logger_, - "Device_id: " << &device_uid << ", app_handle: " << &app_uid + "Device_id: " << &device_uid << ", app_handle: " << &app_handle << " connection not finalized"); return; } |