summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Keeler <jacob.keeler@livioradio.com>2021-04-15 14:24:27 -0400
committerGitHub <noreply@github.com>2021-04-15 14:24:27 -0400
commit0736ea16ce07caaf9ea83bfadb3b8e3eee950b3b (patch)
tree3a50481a2934e4dcaca70d2d5ddeb30b8b2ef83b
parent0045eb26abceea77c9b843e6bd1256dbab381c56 (diff)
downloadsdl_core-0736ea16ce07caaf9ea83bfadb3b8e3eee950b3b.tar.gz
Update travis distro to Ubuntu 20.04 (#3626)
* Update travis distro to 20.04 * Add cppcheck exclusions for false positives * Fix cppcheck issues
-rw-r--r--.travis.yml4
-rw-r--r--src/components/application_manager/src/application_manager_impl.cc2
-rw-r--r--src/components/utils/test/file_system_test.cc4
3 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 9d9cfedb82..d180ba2a85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
language: cpp
-dist: xenial
+dist: focal
sudo: required
only:
- master
@@ -20,7 +20,7 @@ before_install:
- sudo apt-get install -f clang-format-6.0
script:
- - cppcheck --force -isrc/3rd_party -isrc/3rd_party-static --quiet --error-exitcode=1 src
+ - cppcheck --force -isrc/3rd_party -isrc/3rd_party-static --library=googletest --suppress=unknownMacro --suppress=syntaxError:*_test.cc --quiet --error-exitcode=1 src
- ./tools/infrastructure/check_style.sh
- mkdir build && cd build
- cmake ../ -DBUILD_TESTS=ON
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 948f7944d4..475baae9ec 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -614,7 +614,7 @@ ApplicationSharedPtr ApplicationManagerImpl::RegisterApplication(
}
HmiStatePtr initial_state =
- CreateRegularState(std::shared_ptr<Application>(application),
+ CreateRegularState(ApplicationSharedPtr(application),
mobile_apis::WindowType::MAIN,
mobile_apis::HMILevel::INVALID_ENUM,
mobile_apis::AudioStreamingState::INVALID_ENUM,
diff --git a/src/components/utils/test/file_system_test.cc b/src/components/utils/test/file_system_test.cc
index a94392f81c..9d4e943df6 100644
--- a/src/components/utils/test/file_system_test.cc
+++ b/src/components/utils/test/file_system_test.cc
@@ -47,8 +47,8 @@ typedef std::vector<std::string> StringArray;
using namespace file_system;
namespace {
-StringArray MergeStringsToArray(const std::string& first,
- const std::string& second) {
+StringArray MergeStringsToArray(const std::string first,
+ const std::string second) {
StringArray array_of_strings;
array_of_strings.reserve(2);