summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjacobkeeler <jacob.keeler@livioradio.com>2018-01-17 17:13:41 -0500
committerjacobkeeler <jacob.keeler@livioradio.com>2018-01-17 17:13:41 -0500
commit97a8191a57275c27a3bc58cd8e7b09b5ee4f92db (patch)
tree1f41062bcfc3c3278033382ce905b76394202e46
parente8911d03dde016a29b01fe80533bc6ac56531678 (diff)
downloadsdl_core-fix/gcc6_build.tar.gz
Fix build errors with GCC6+fix/gcc6_build
-rw-r--r--src/components/application_manager/src/commands/command_request_impl.cc1
-rw-r--r--src/components/application_manager/test/state_controller/state_controller_test.cc2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/components/application_manager/src/commands/command_request_impl.cc b/src/components/application_manager/src/commands/command_request_impl.cc
index 09aa4169e5..515d8a998c 100644
--- a/src/components/application_manager/src/commands/command_request_impl.cc
+++ b/src/components/application_manager/src/commands/command_request_impl.cc
@@ -31,6 +31,7 @@
*/
#include <algorithm>
+#include <numeric>
#include <string>
#include "utils/macro.h"
#include "utils/make_shared.h"
diff --git a/src/components/application_manager/test/state_controller/state_controller_test.cc b/src/components/application_manager/test/state_controller/state_controller_test.cc
index eb718c8b8b..f868ed3feb 100644
--- a/src/components/application_manager/test/state_controller/state_controller_test.cc
+++ b/src/components/application_manager/test/state_controller/state_controller_test.cc
@@ -1829,7 +1829,7 @@ TEST_F(StateControllerImplTest, DISABLED_ActivateAppSuccessReceivedFromHMI) {
for (; it != hmi_states.end(); ++it) {
am::HmiStatePtr hmi_state = it->first;
- am::HmiStatePtr initial_hmi_state = it->first;
+ am::HmiStatePtr initial_hmi_state = it2->first;
Common_HMILevel::eType hmi_level = it->second;
SetBCActivateAppRequestToHMI(hmi_level, corr_id);