Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Unified Diff: chromeos/cryptohome/cryptohome_parameters.cc

Issue 1540803002: Switch to standard integer types in chromeos/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more includes Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/cryptohome/cryptohome_parameters.h ('k') | chromeos/cryptohome/cryptohome_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/cryptohome/cryptohome_parameters.cc
diff --git a/chromeos/cryptohome/cryptohome_parameters.cc b/chromeos/cryptohome/cryptohome_parameters.cc
index 5b3ac4d4372cab188879a70c44222ed22e442f46..8b65a710e471f53b8ba07dbf8719901bd53b1643 100644
--- a/chromeos/cryptohome/cryptohome_parameters.cc
+++ b/chromeos/cryptohome/cryptohome_parameters.cc
@@ -4,6 +4,9 @@
#include "chromeos/cryptohome/cryptohome_parameters.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include "chromeos/dbus/cryptohome/key.pb.h"
namespace cryptohome {
@@ -81,15 +84,14 @@ KeyDefinition::ProviderData::ProviderData(const std::string& name)
KeyDefinition::ProviderData::ProviderData(const ProviderData& other)
: name(other.name) {
if (other.number)
- number.reset(new int64(*other.number));
+ number.reset(new int64_t(*other.number));
if (other.bytes)
bytes.reset(new std::string(*other.bytes));
}
-KeyDefinition::ProviderData::ProviderData(const std::string& name, int64 number)
- : name(name),
- number(new int64(number)) {
-}
+KeyDefinition::ProviderData::ProviderData(const std::string& name,
+ int64_t number)
+ : name(name), number(new int64_t(number)) {}
KeyDefinition::ProviderData::ProviderData(const std::string& name,
const std::string& bytes)
@@ -99,7 +101,7 @@ KeyDefinition::ProviderData::ProviderData(const std::string& name,
void KeyDefinition::ProviderData::operator=(const ProviderData& other) {
name = other.name;
- number.reset(other.number ? new int64(*other.number) : NULL);
+ number.reset(other.number ? new int64_t(*other.number) : NULL);
bytes.reset(other.bytes ? new std::string(*other.bytes) : NULL);
}
« no previous file with comments | « chromeos/cryptohome/cryptohome_parameters.h ('k') | chromeos/cryptohome/cryptohome_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698