diff options
| author | wfh <wfh@chromium.org> | 2015-03-09 18:32:59 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-10 01:34:02 +0000 |
| commit | bf68f4d5ba5c035cf1aaaa4ee5915cd3e7c15327 (patch) | |
| tree | b41b76e2441a6723fc9b2bcb2c9199f6317bdb29 /chrome/installer/test | |
| parent | 5ddb1905aa591a2bfa6ab43d7fe2226e4cba6d81 (diff) | |
| download | chromium_src-bf68f4d5ba5c035cf1aaaa4ee5915cd3e7c15327.zip chromium_src-bf68f4d5ba5c035cf1aaaa4ee5915cd3e7c15327.tar.gz chromium_src-bf68f4d5ba5c035cf1aaaa4ee5915cd3e7c15327.tar.bz2 | |
Support 32-bit subversion fields in base::Version.
BUG=464610
TEST=base_unittests
Review URL: https://codereview.chromium.org/985573003
Cr-Commit-Position: refs/heads/master@{#319806}
Diffstat (limited to 'chrome/installer/test')
| -rw-r--r-- | chrome/installer/test/alternate_version_generator.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/installer/test/alternate_version_generator.cc b/chrome/installer/test/alternate_version_generator.cc index 98c72cf..e50c293 100644 --- a/chrome/installer/test/alternate_version_generator.cc +++ b/chrome/installer/test/alternate_version_generator.cc @@ -111,7 +111,7 @@ class ChromeVersion { static ChromeVersion FromString(const std::string& version_string) { Version version(version_string); DCHECK(version.IsValid()); - const std::vector<uint16>& c(version.components()); + const std::vector<uint32_t>& c(version.components()); return ChromeVersion(static_cast<ULONGLONG>(c[0]) << 48 | static_cast<ULONGLONG>(c[1]) << 32 | static_cast<ULONGLONG>(c[2]) << 16 | |