Merge pull request #2861 from smartdevicelink/fix/5.1.0_build_failures

Fix build failures depending on options

2 files changed, 5 insertions, 5 deletions

diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 51c10f6cc5..b0a0514e77 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -1027,10 +1027,10 @@ void ApplicationManagerImpl::RefreshCloudAppInformation() {
     const std::string app_icon_dir(settings_.app_icons_folder());
     const std::string full_icon_path(app_icon_dir + "/" + policy_id);
     if (!file_system::FileExists(full_icon_path)) {
-      int icon_map_size = app_icon_map_.size();
       AppIconInfo icon_info(endpoint, false);
-      LOG4CXX_DEBUG(logger_,
-                    "Inserting cloud app into icon map: " << icon_map_size);
+      LOG4CXX_DEBUG(
+          logger_,
+          "Inserting cloud app into icon map: " << app_icon_map_.size());
       app_icon_map_.insert(
           std::pair<std::string, AppIconInfo>(policy_id, icon_info));
     }
diff --git a/src/components/application_manager/src/rpc_passing_handler.cc b/src/components/application_manager/src/rpc_passing_handler.cc
index 3e90b86663..04d66ed207 100644
--- a/src/components/application_manager/src/rpc_passing_handler.cc
+++ b/src/components/application_manager/src/rpc_passing_handler.cc
@@ -331,10 +331,10 @@ void RPCPassingHandler::ClearCompletedTimers() {
   LOG4CXX_DEBUG(logger_, "Clearing Completed Timers");
   for (auto it = timeout_queue_.begin(); it != timeout_queue_.end();) {
     TimerSPtr timer = it->first;
-    uint32_t cid = it->second;
     if (timer->is_completed()) {
       LOG4CXX_DEBUG(logger_,
-                    "Removing completed timer for correlation id " << cid);
+                    "Removing completed timer for correlation id "
+                        << it->second);
       it = timeout_queue_.erase(it);
     } else {
       ++it;