aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-01-19 12:34:18 +0000
committerBen Murdoch <benm@google.com>2011-01-20 11:56:33 +0000
commit85816cb2b687fe806bc6490054c53f9bd0f1d9d2 (patch)
tree8197adf6635b8d5a5347105d76b51fb8ca2fe53a /include
parent94e1191aadda9f44c360c33b19deafbf94881fd5 (diff)
downloadv8-85816cb2b687fe806bc6490054c53f9bd0f1d9d2.tar.gz
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 'include')
-rw-r--r--include/v8.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/v8.h b/include/v8.h
index 2684cd34..a202eaa7 100644
--- a/include/v8.h
+++ b/include/v8.h
@@ -3314,7 +3314,7 @@ template <> struct SmiTagging<4> {
// For 32-bit systems any 2 bytes aligned pointer can be encoded as smi
// with a plain reinterpret_cast.
- static const intptr_t kEncodablePointerMask = 0x1;
+ static const uintptr_t kEncodablePointerMask = 0x1;
static const int kPointerToSmiShift = 0;
};
@@ -3334,8 +3334,8 @@ template <> struct SmiTagging<8> {
// It might be not enough to cover stack allocated objects on some platforms.
static const int kPointerAlignment = 3;
- static const intptr_t kEncodablePointerMask =
- ~(intptr_t(0xffffffff) << kPointerAlignment);
+ static const uintptr_t kEncodablePointerMask =
+ ~(uintptr_t(0xffffffff) << kPointerAlignment);
static const int kPointerToSmiShift =
kSmiTagSize + kSmiShiftSize - kPointerAlignment;
@@ -3344,7 +3344,7 @@ template <> struct SmiTagging<8> {
typedef SmiTagging<kApiPointerSize> PlatformSmiTagging;
const int kSmiShiftSize = PlatformSmiTagging::kSmiShiftSize;
const int kSmiValueSize = PlatformSmiTagging::kSmiValueSize;
-const intptr_t kEncodablePointerMask =
+const uintptr_t kEncodablePointerMask =
PlatformSmiTagging::kEncodablePointerMask;
const int kPointerToSmiShift = PlatformSmiTagging::kPointerToSmiShift;
@@ -3404,7 +3404,7 @@ class Internals {
}
static inline void* GetExternalPointerFromSmi(internal::Object* value) {
- const intptr_t address = reinterpret_cast<intptr_t>(value);
+ const uintptr_t address = reinterpret_cast<uintptr_t>(value);
return reinterpret_cast<void*>(address >> kPointerToSmiShift);
}