diff options
| -rw-r--r-- | js/src/gc/Heap.h | 4 | ||||
| -rw-r--r-- | js/src/regexp/regexp-error.h | 1 | ||||
| -rw-r--r-- | js/src/regexp/regexp-shim.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/js/src/gc/Heap.h b/js/src/gc/Heap.h index 208941532..2f2770260 100644 --- a/js/src/gc/Heap.h +++ b/js/src/gc/Heap.h @@ -280,13 +280,13 @@ struct Cell template<class T> inline T* as() { - MOZ_ASSERT(is<T>()); + MOZ_ASSERT(this->is<T>()); return static_cast<T*>(this); } template <class T> inline const T* as() const { - MOZ_ASSERT(is<T>()); + MOZ_ASSERT(this->is<T>()); return static_cast<const T*>(this); } diff --git a/js/src/regexp/regexp-error.h b/js/src/regexp/regexp-error.h index ef9d037dd..4b495f07d 100644 --- a/js/src/regexp/regexp-error.h +++ b/js/src/regexp/regexp-error.h @@ -5,6 +5,7 @@ #ifndef V8_REGEXP_REGEXP_ERROR_H_ #define V8_REGEXP_REGEXP_ERROR_H_ +#include "regexp-shim.h" namespace v8 { namespace internal { diff --git a/js/src/regexp/regexp-shim.h b/js/src/regexp/regexp-shim.h index 6b6a8c639..7677da084 100644 --- a/js/src/regexp/regexp-shim.h +++ b/js/src/regexp/regexp-shim.h @@ -957,7 +957,7 @@ class JSRegExp : public HeapObject { private: js::RegExpShared* inner() { - return value_.toGCThing()->as<js::RegExpShared>(); + return reinterpret_cast<js::RegExpShared*>(value_.toGCThing()); } }; |