summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJackLivio <jack@livio.io>2019-01-23 21:27:56 -0500
committerJackLivio <jack@livio.io>2019-01-23 21:27:56 -0500
commit1057d6f4fc933c681ec52365c51268a8f3418a07 (patch)
tree3e6f31c1442626e9ed1d78c7656a470f8e73a0d9
parent6b86e197ba38f6af3ba6390e920cae6f9abe654d (diff)
downloadsdl_core-1057d6f4fc933c681ec52365c51268a8f3418a07.tar.gz
Change handled_rpc to uint32
-rw-r--r--src/components/application_manager/include/application_manager/policies/policy_handler.h2
-rw-r--r--src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc2
-rw-r--r--src/components/application_manager/src/policies/policy_handler.cc2
-rw-r--r--src/components/include/application_manager/policies/policy_handler_interface.h2
-rw-r--r--src/components/include/policy/policy_external/policy/policy_manager.h2
-rw-r--r--src/components/include/policy/policy_regular/policy/policy_manager.h2
-rw-r--r--src/components/policy/policy_external/include/policy/cache_manager.h2
-rw-r--r--src/components/policy/policy_external/include/policy/cache_manager_interface.h2
-rw-r--r--src/components/policy/policy_external/include/policy/policy_manager_impl.h2
-rw-r--r--src/components/policy/policy_external/src/cache_manager.cc2
-rw-r--r--src/components/policy/policy_external/src/policy_manager_impl.cc2
-rw-r--r--src/components/policy/policy_regular/include/policy/cache_manager.h2
-rw-r--r--src/components/policy/policy_regular/include/policy/cache_manager_interface.h2
-rw-r--r--src/components/policy/policy_regular/include/policy/policy_manager_impl.h2
-rw-r--r--src/components/policy/policy_regular/include/policy/policy_table/types.h2
-rw-r--r--src/components/policy/policy_regular/src/cache_manager.cc2
-rw-r--r--src/components/policy/policy_regular/src/policy_manager_impl.cc2
17 files changed, 17 insertions, 17 deletions
diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h
index ffc5037e3b..1dff9e348c 100644
--- a/src/components/application_manager/include/application_manager/policies/policy_handler.h
+++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h
@@ -450,7 +450,7 @@ class PolicyHandler : public PolicyHandlerInterface,
void GetAppServiceParameters(const std::string& policy_app_id,
std::string& service_name,
std::string& service_type,
- std::vector<uint64_t>& handled_rpcs) const;
+ std::vector<uint32_t>& handled_rpcs) const;
virtual void OnUpdateHMIAppType(
std::map<std::string, StringArray> app_hmi_types) OVERRIDE;
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc
index 05fe75c887..b48f844263 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc
@@ -90,7 +90,7 @@ void PublishAppServiceRequest::Run() {
std::string service_name = std::string();
std::string service_type = std::string();
- std::vector<uint64_t> handled_rpcs = {};
+ std::vector<uint32_t> handled_rpcs = {};
ApplicationSharedPtr app = application_manager_.application(connection_key());
policy_handler_.GetAppServiceParameters(
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc
index 6270b4e8b4..6034e34b18 100644
--- a/src/components/application_manager/src/policies/policy_handler.cc
+++ b/src/components/application_manager/src/policies/policy_handler.cc
@@ -1941,7 +1941,7 @@ void PolicyHandler::GetAppServiceParameters(
const std::string& policy_app_id,
std::string& service_name,
std::string& service_type,
- std::vector<uint64_t>& handled_rpcs) const {
+ std::vector<uint32_t>& handled_rpcs) const {
POLICY_LIB_CHECK_VOID();
policy_manager_->GetAppServiceParameters(
policy_app_id, service_name, service_type, handled_rpcs);
diff --git a/src/components/include/application_manager/policies/policy_handler_interface.h b/src/components/include/application_manager/policies/policy_handler_interface.h
index 914b33204d..858145e329 100644
--- a/src/components/include/application_manager/policies/policy_handler_interface.h
+++ b/src/components/include/application_manager/policies/policy_handler_interface.h
@@ -492,7 +492,7 @@ class PolicyHandlerInterface {
const std::string& policy_app_id,
std::string& service_name,
std::string& service_type,
- std::vector<uint64_t>& handled_rpcs) const = 0;
+ std::vector<uint32_t>& handled_rpcs) const = 0;
#ifdef EXTERNAL_PROPRIETARY_MODE
/**
diff --git a/src/components/include/policy/policy_external/policy/policy_manager.h b/src/components/include/policy/policy_external/policy/policy_manager.h
index e7d682e257..96b2d5d659 100644
--- a/src/components/include/policy/policy_external/policy/policy_manager.h
+++ b/src/components/include/policy/policy_external/policy/policy_manager.h
@@ -604,7 +604,7 @@ class PolicyManager : public usage_statistics::StatisticsManager {
const std::string& policy_app_id,
std::string& service_name,
std::string& service_type,
- std::vector<uint64_t>& handled_rpcs) const = 0;
+ std::vector<uint32_t>& handled_rpcs) const = 0;
/**
* @brief Gets meta information
diff --git a/src/components/include/policy/policy_regular/policy/policy_manager.h b/src/components/include/policy/policy_regular/policy/policy_manager.h
index 6c8b8fb3e5..e62d12cd03 100644
--- a/src/components/include/policy/policy_regular/policy/policy_manager.h
+++ b/src/components/include/policy/policy_regular/policy/policy_manager.h
@@ -585,7 +585,7 @@ class PolicyManager : public usage_statistics::StatisticsManager {
const std::string& policy_app_id,
std::string& service_name,
std::string& service_type,
- std::vector<uint64_t>& handled_rpcs) const = 0;
+ std::vector<uint32_t>& handled_rpcs) const = 0;
/**
* @brief OnAppRegisteredOnMobile allows to handle event when application were
diff --git a/src/components/policy/policy_external/include/policy/cache_manager.h b/src/components/policy/policy_external/include/policy/cache_manager.h
index 9cc1d25bfb..e31e3e6c34 100644
--- a/src/components/policy/policy_external/include/policy/cache_manager.h
+++ b/src/components/policy/policy_external/include/policy/cache_manager.h
@@ -240,7 +240,7 @@ class CacheManager : public CacheManagerInterface {
const std::string& policy_app_id,
std::string& service_name,
std::string& service_type,
- std::vector<uint64_t>& handled_rpcs) const;
+ std::vector<uint32_t>& handled_rpcs) const;
/**
* @brief Allows to update 'vin' field in module_meta table.
diff --git a/src/components/policy/policy_external/include/policy/cache_manager_interface.h b/src/components/policy/policy_external/include/policy/cache_manager_interface.h
index b48b6a1041..5b9fe5cfcb 100644
--- a/src/components/policy/policy_external/include/policy/cache_manager_interface.h
+++ b/src/components/policy/policy_external/include/policy/cache_manager_interface.h
@@ -249,7 +249,7 @@ class CacheManagerInterface {
const std::string& policy_app_id,
std::string& service_name,
std::string& service_type,
- std::vector<uint64_t>& handled_rpcs) const = 0;
+ std::vector<uint32_t>& handled_rpcs) const = 0;
/**
* @brief Allows to update 'vin' field in module_meta table.
diff --git a/src/components/policy/policy_external/include/policy/policy_manager_impl.h b/src/components/policy/policy_external/include/policy/policy_manager_impl.h
index fa64614e1f..b5a9709ecc 100644
--- a/src/components/policy/policy_external/include/policy/policy_manager_impl.h
+++ b/src/components/policy/policy_external/include/policy/policy_manager_impl.h
@@ -651,7 +651,7 @@ class PolicyManagerImpl : public PolicyManager {
const std::string& policy_app_id,
std::string& service_name,
std::string& service_type,
- std::vector<uint64_t>& handled_rpcs) const OVERRIDE;
+ std::vector<uint32_t>& handled_rpcs) const OVERRIDE;
/**
* @brief OnAppRegisteredOnMobile allows to handle event when application were
diff --git a/src/components/policy/policy_external/src/cache_manager.cc b/src/components/policy/policy_external/src/cache_manager.cc
index b94230548f..663ac7b395 100644
--- a/src/components/policy/policy_external/src/cache_manager.cc
+++ b/src/components/policy/policy_external/src/cache_manager.cc
@@ -1505,7 +1505,7 @@ void CacheManager::GetAppServiceParameters(
const std::string& policy_app_id,
std::string& service_name,
std::string& service_type,
- std::vector<uint64_t>& handled_rpcs) const {
+ std::vector<uint32_t>& handled_rpcs) const {
LOG4CXX_AUTO_TRACE(logger_);
const policy_table::ApplicationPolicies& policies =
pt_->policy_table.app_policies_section.apps;
diff --git a/src/components/policy/policy_external/src/policy_manager_impl.cc b/src/components/policy/policy_external/src/policy_manager_impl.cc
index 56eac75127..e50a3ecedd 100644
--- a/src/components/policy/policy_external/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_external/src/policy_manager_impl.cc
@@ -776,7 +776,7 @@ void PolicyManagerImpl::GetAppServiceParameters(
const std::string& policy_app_id,
std::string& service_name,
std::string& service_type,
- std::vector<uint64_t>& handled_rpcs) const {
+ std::vector<uint32_t>& handled_rpcs) const {
cache_->GetAppServiceParameters(
policy_app_id, service_name, service_type, handled_rpcs);
}
diff --git a/src/components/policy/policy_regular/include/policy/cache_manager.h b/src/components/policy/policy_regular/include/policy/cache_manager.h
index 69b3fe4706..6d042f6ac3 100644
--- a/src/components/policy/policy_regular/include/policy/cache_manager.h
+++ b/src/components/policy/policy_regular/include/policy/cache_manager.h
@@ -228,7 +228,7 @@ class CacheManager : public CacheManagerInterface {
const std::string& policy_app_id,
std::string& service_name,
std::string& service_type,
- std::vector<uint64_t>& handled_rpcs) const;
+ std::vector<uint32_t>& handled_rpcs) const;
/**
* @brief Allows to update 'vin' field in module_meta table.
diff --git a/src/components/policy/policy_regular/include/policy/cache_manager_interface.h b/src/components/policy/policy_regular/include/policy/cache_manager_interface.h
index ceb30eb4d1..3973eca581 100644
--- a/src/components/policy/policy_regular/include/policy/cache_manager_interface.h
+++ b/src/components/policy/policy_regular/include/policy/cache_manager_interface.h
@@ -235,7 +235,7 @@ class CacheManagerInterface {
const std::string& policy_app_id,
std::string& service_name,
std::string& service_type,
- std::vector<uint64_t>& handled_rpcs) const = 0;
+ std::vector<uint32_t>& handled_rpcs) const = 0;
/**
* @brief Allows to update 'vin' field in module_meta table.
diff --git a/src/components/policy/policy_regular/include/policy/policy_manager_impl.h b/src/components/policy/policy_regular/include/policy/policy_manager_impl.h
index 6676510df5..f4dd5d0870 100644
--- a/src/components/policy/policy_regular/include/policy/policy_manager_impl.h
+++ b/src/components/policy/policy_regular/include/policy/policy_manager_impl.h
@@ -646,7 +646,7 @@ class PolicyManagerImpl : public PolicyManager {
const std::string& policy_app_id,
std::string& service_name,
std::string& service_type,
- std::vector<uint64_t>& handled_rpcs) const OVERRIDE;
+ std::vector<uint32_t>& handled_rpcs) const OVERRIDE;
/**
* @brief OnAppRegisteredOnMobile allows to handle event when application were
diff --git a/src/components/policy/policy_regular/include/policy/policy_table/types.h b/src/components/policy/policy_regular/include/policy/policy_table/types.h
index a1779367cc..f2f99003e2 100644
--- a/src/components/policy/policy_regular/include/policy/policy_table/types.h
+++ b/src/components/policy/policy_regular/include/policy/policy_table/types.h
@@ -98,7 +98,7 @@ typedef Array<Enum<RequestType>, 0, 255> RequestTypes;
typedef Strings RequestSubTypes;
-typedef Array<Integer<uint64_t, 0u, UINT_MAX>, 0, 255> HandledRpcs;
+typedef Array<Integer<uint32_t, 0, UINT32_MAX>, 0, 255> HandledRpcs;
typedef Map<Strings, 0, 255> RemoteRpcs;
typedef Map<RemoteRpcs, 0, 255> AccessModules;
diff --git a/src/components/policy/policy_regular/src/cache_manager.cc b/src/components/policy/policy_regular/src/cache_manager.cc
index 5e92fc7535..9396534677 100644
--- a/src/components/policy/policy_regular/src/cache_manager.cc
+++ b/src/components/policy/policy_regular/src/cache_manager.cc
@@ -800,7 +800,7 @@ void CacheManager::GetAppServiceParameters(
const std::string& policy_app_id,
std::string& service_name,
std::string& service_type,
- std::vector<uint64_t>& handled_rpcs) const {
+ std::vector<uint32_t>& handled_rpcs) const {
LOG4CXX_AUTO_TRACE(logger_);
const policy_table::ApplicationPolicies& policies =
pt_->policy_table.app_policies_section.apps;
diff --git a/src/components/policy/policy_regular/src/policy_manager_impl.cc b/src/components/policy/policy_regular/src/policy_manager_impl.cc
index d223a6a433..12dd322e6c 100644
--- a/src/components/policy/policy_regular/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc
@@ -595,7 +595,7 @@ void PolicyManagerImpl::GetAppServiceParameters(
const std::string& policy_app_id,
std::string& service_name,
std::string& service_type,
- std::vector<uint64_t>& handled_rpcs) const {
+ std::vector<uint32_t>& handled_rpcs) const {
cache_->GetAppServiceParameters(
policy_app_id, service_name, service_type, handled_rpcs);
}