2 files changed, 14 insertions, 13 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 1676331fbc..1fb7d68d25 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
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2013, Ford Motor Company
+ Copyright (c) 2016, Ford Motor Company
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
@@ -37,6 +37,7 @@
 #include <map>
 #include <set>
 #include <vector>
+#include <cstdint>
 #include "policy/policy_manager.h"
 #include "application_manager/policies/policy_event_observer.h"
 #include "application_manager/policies/delegates/statistics_delegate.h"
@@ -82,7 +83,7 @@ public:
   virtual void OnPermissionsUpdated(const std::string &policy_app_id,
                                     const Permissions &permissions);
 
-  virtual void OnSnapshotCreated(const BinaryMessage &pt_string);
+  void OnSnapshotCreated(const BinaryMessage &pt_string) OVERRIDE;
 
   bool GetPriority(const std::string &policy_app_id, std::string *priority);
   void CheckPermissions(const PTString &app_id, const PTString &hmi_level,
@@ -101,7 +102,7 @@ public:
 
   std::string GetLockScreenIconUrl() const;
   void ResetRetrySequence();
-  int NextRetryTimeout();
+  uint32_t NextRetryTimeout();
   int TimeoutExchange();
   void OnExceededTimeout();
   void OnSystemReady();
@@ -230,7 +231,7 @@ public:
   /**
    * @brief Send request to HMI to get update on system parameters
    */
-  virtual void OnSystemInfoUpdateRequired();
+  void OnSystemInfoUpdateRequired() OVERRIDE;
 
   /**
    * @brief Sends GetVehicleData request in case when Vechicle info is ready.
@@ -269,19 +270,19 @@ public:
 
   std::string GetAppName(const std::string &policy_app_id);
 
-  virtual void
-  OnUpdateHMIAppType(std::map<std::string, StringArray> app_hmi_types);
+  void
+  OnUpdateHMIAppType(std::map<std::string, StringArray> app_hmi_types) OVERRIDE;
 
-  virtual void OnCertificateUpdated(const std::string &certificate_data);
+  void OnCertificateUpdated(const std::string &certificate_data) OVERRIDE;
 
-  virtual bool CanUpdate();
+  bool CanUpdate() OVERRIDE;
 
-  virtual void OnDeviceConsentChanged(const std::string &device_id,
-                                      bool is_allowed);
+  void OnDeviceConsentChanged(const std::string &device_id,
+                              bool is_allowed) OVERRIDE;
 
   virtual void OnPTExchangeNeeded();
 
-  virtual void GetAvailableApps(std::queue<std::string> &apps);
+  void GetAvailableApps(std::queue<std::string> &apps) OVERRIDE;
 
   /**
    * @brief Allows to add new or update existed application during
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc
index 99750aaccc..8732a122c5 100644
--- a/src/components/application_manager/src/policies/policy_handler.cc
+++ b/src/components/application_manager/src/policies/policy_handler.cc
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2014, Ford Motor Company
+ Copyright (c) 2016, Ford Motor Company
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
@@ -1066,7 +1066,7 @@ void PolicyHandler::ResetRetrySequence() {
   policy_manager_->ResetRetrySequence();
 }
 
-int PolicyHandler::NextRetryTimeout() {
+uint32_t PolicyHandler::NextRetryTimeout() {
   POLICY_LIB_CHECK(0);
   return policy_manager_->NextRetryTimeout();
 }