diff options
| author | jacobkeeler <jacob.keeler@livioradio.com> | 2018-08-22 21:43:02 -0400 |
|---|---|---|
| committer | jacobkeeler <jacob.keeler@livioradio.com> | 2018-08-23 09:11:02 -0400 |
| commit | 370c752cc6f7c27845c129c73a41d069323055f1 (patch) | |
| tree | dbd4effdeb32f5766bdf02542dfb32848a81a324 | |
| parent | 6ada4dc5bd0d9a2b6068745154e715fccd5dc943 (diff) | |
| download | sdl_core-370c752cc6f7c27845c129c73a41d069323055f1.tar.gz | |
Fix build failures after merge
2 files changed, 5 insertions, 6 deletions
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager_impl.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager_impl.h index b36f47f260..9b16a2c4da 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager_impl.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager_impl.h @@ -107,7 +107,7 @@ class InteriorDataManagerImpl : public InteriorDataManager { * @brief RequestsToHMIHistory mapping from module type to vector of time * stamps */ - typedef std::map<std::string, std::deque<TimevalStruct> > + typedef std::map<std::string, std::deque<date_time::TimeDuration> > RequestsToHMIHistory; RequestsToHMIHistory requests_to_hmi_history_; mutable sync_primitives::Lock requests_to_hmi_history_lock_; diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_manager_impl.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_manager_impl.cc index 28ed2cd941..0c42f6e3de 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_manager_impl.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_manager_impl.cc @@ -52,8 +52,7 @@ void InteriorDataManagerImpl::StoreRequestToHMITime( const std::string& module_type) { LOG4CXX_AUTO_TRACE(logger_); sync_primitives::AutoLock autolock(requests_to_hmi_history_lock_); - requests_to_hmi_history_[module_type].push_back( - date_time::DateTime::getCurrentTime()); + requests_to_hmi_history_[module_type].push_back(date_time::getCurrentTime()); } bool InteriorDataManagerImpl::CheckRequestsToHMIFrequency( @@ -129,9 +128,9 @@ void InteriorDataManagerImpl::UnsubscribeFromInteriorVehicleData( void InteriorDataManagerImpl::ClearOldRequestsToHMIHistory() { auto limit = app_mngr_.get_settings().get_interior_vehicle_data_frequency().second; - uint32_t time_frame = limit * date_time::DateTime::MILLISECONDS_IN_SECOND; - auto lest_that_time_frame_ago = [time_frame](TimevalStruct time) { - auto span = date_time::DateTime::calculateTimeSpan(time); + uint32_t time_frame = limit * date_time::MILLISECONDS_IN_SECOND; + auto lest_that_time_frame_ago = [time_frame](date_time::TimeDuration time) { + auto span = date_time::calculateTimeSpan(time); return span < time_frame; }; for (auto& it : requests_to_hmi_history_) { |