From a3028ada75525261fd60ac92f82e54254008f7cf Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Mon, 13 Jun 2022 01:28:14 +0200 Subject: [PATCH] Warning fixes Signed-off-by: Alexander Borsuk --- 3party/opening_hours/CMakeLists.txt | 4 +--- routing_common/vehicle_model.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/3party/opening_hours/CMakeLists.txt b/3party/opening_hours/CMakeLists.txt index c6a92dd281..18fb702d92 100644 --- a/3party/opening_hours/CMakeLists.txt +++ b/3party/opening_hours/CMakeLists.txt @@ -21,9 +21,7 @@ omim_add_library(${PROJECT_NAME} ${SRC}) target_include_directories(${PROJECT_NAME} INTERFACE .) -if (NOT PLATFORM_ANDROID) - target_compile_options(${PROJECT_NAME} PRIVATE -Wno-deprecated-copy) -endif() +target_compile_options(${PROJECT_NAME} PRIVATE -Wno-deprecated-copy) omim_add_test_subdirectory(opening_hours_tests) omim_add_test_subdirectory(opening_hours_integration_tests) diff --git a/routing_common/vehicle_model.cpp b/routing_common/vehicle_model.cpp index 143ad1f82c..bda9b93d74 100644 --- a/routing_common/vehicle_model.cpp +++ b/routing_common/vehicle_model.cpp @@ -75,7 +75,7 @@ VehicleModel::VehicleModel(Classificator const & classif, LimitsInitList const & ASSERT_LESS_OR_EQUAL(speedFactor.m_eta, 1.0, ()); ASSERT_GREATER(speedFactor.m_weight, 0.0, ()); ASSERT_GREATER(speedFactor.m_eta, 0.0, ()); - m_surfaceFactors.Insert(classif.GetTypeByPath(v.m_type), v.m_factor); + m_surfaceFactors.Insert(classif.GetTypeByPath(v.m_type), speedFactor); } }