diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-19 12:34:18 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-01-20 11:56:33 +0000 |
| commit | 85816cb2b687fe806bc6490054c53f9bd0f1d9d2 (patch) | |
| tree | 8197adf6635b8d5a5347105d76b51fb8ca2fe53a /src | |
| parent | 94e1191aadda9f44c360c33b19deafbf94881fd5 (diff) | |
| download | android_external_v8-85816cb2b687fe806bc6490054c53f9bd0f1d9d2.tar.gz android_external_v8-85816cb2b687fe806bc6490054c53f9bd0f1d9d2.tar.bz2 android_external_v8-85816cb2b687fe806bc6490054c53f9bd0f1d9d2.zip | |
Update v8 to r6394 (2.5 branch)
This is v8 2.5.9.11.
http://v8.googlecode.com/svn/branches/2.5@6394
Change-Id: I179913c9c86d36bfc5c6b8a50cdbf8d306508a93
Diffstat (limited to 'src')
| -rw-r--r-- | src/api.cc | 4 | ||||
| -rw-r--r-- | src/version.cc | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -3244,14 +3244,14 @@ void v8::Object::SetInternalField(int index, v8::Handle<Value> value) { static bool CanBeEncodedAsSmi(void* ptr) { - const intptr_t address = reinterpret_cast<intptr_t>(ptr); + const uintptr_t address = reinterpret_cast<uintptr_t>(ptr); return ((address & i::kEncodablePointerMask) == 0); } static i::Smi* EncodeAsSmi(void* ptr) { ASSERT(CanBeEncodedAsSmi(ptr)); - const intptr_t address = reinterpret_cast<intptr_t>(ptr); + const uintptr_t address = reinterpret_cast<uintptr_t>(ptr); i::Smi* result = reinterpret_cast<i::Smi*>(address << i::kPointerToSmiShift); ASSERT(i::Internals::HasSmiTag(result)); ASSERT_EQ(result, i::Smi::FromInt(result->value())); diff --git a/src/version.cc b/src/version.cc index 7b552eee..24e95847 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 2 #define MINOR_VERSION 5 #define BUILD_NUMBER 9 -#define PATCH_LEVEL 9 +#define PATCH_LEVEL 11 #define CANDIDATE_VERSION false // Define SONAME to have the SCons build the put a specific SONAME into the |