diff options
| author | Emily Bernier <ember@google.com> | 2015-03-24 16:35:39 -0400 |
|---|---|---|
| committer | Emily Bernier <ember@google.com> | 2015-06-23 16:55:40 -0400 |
| commit | 958fae7ec3f466955f8e5b50fa5b8d38b9e91675 (patch) | |
| tree | a63ee37f93192ad427f88ed926743f6bb6014312 /src/version.h | |
| parent | 57a14c9a8621270b0e6c697dce28a9c453ebe55f (diff) | |
| download | android_external_v8-958fae7ec3f466955f8e5b50fa5b8d38b9e91675.tar.gz android_external_v8-958fae7ec3f466955f8e5b50fa5b8d38b9e91675.tar.bz2 android_external_v8-958fae7ec3f466955f8e5b50fa5b8d38b9e91675.zip | |
Update V8 to version 4.1.0.21
This is a cherry-pick of all commits up to and including the
4.1.0.21 cherry-pick in Chromium.
Original commit message:
Version 4.1.0.21 (cherry-pick)
Merged 206e9136bde0f2b5ae8cb77afbb1e7833e5bd412
Unlink pages from the space page list after evacuation.
BUG=430201
LOG=N
R=jkummerow@chromium.org
Review URL: https://codereview.chromium.org/953813002
Cr-Commit-Position: refs/branch-heads/4.1@{#22}
Cr-Branched-From: 2e08d2a7aa9d65d269d8c57aba82eb38a8cb0a18-refs/heads/candidates@{#25353}
---
Change-Id: I8c23c7bbb70772b4858fe8a47b64fa97ee0d1f8c
Diffstat (limited to 'src/version.h')
| -rw-r--r-- | src/version.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/version.h b/src/version.h index 4f600054..dbcec1b2 100644 --- a/src/version.h +++ b/src/version.h @@ -5,6 +5,8 @@ #ifndef V8_VERSION_H_ #define V8_VERSION_H_ +#include "src/base/functional.h" + namespace v8 { namespace internal { @@ -16,7 +18,10 @@ class Version { static int GetBuild() { return build_; } static int GetPatch() { return patch_; } static bool IsCandidate() { return candidate_; } - static int Hash() { return (major_ << 20) ^ (minor_ << 10) ^ patch_; } + static uint32_t Hash() { + return static_cast<uint32_t>( + base::hash_combine(major_, minor_, build_, patch_)); + } // Calculate the V8 version string. static void GetString(Vector<char> str); |