Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-09 04:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 797217 - Replace InternalHandleBase::zeroPointer with NullPtr::constNullValue. r=terrence

Browse Source 
--HG--
extra : rebase_source : f70e1d996fb01e790b277524128faa68060dac6d
This commit is contained in:
Steve Fink 2012-10-05 13:16:39 -07:00
parent 5f92bc6efb
commit 3110eb99d4
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/gc/Root.h
View File

@ -261,17 +261,11 @@ namespace js {
* when you need a parameter type for something that *may* be a pointer to a
* direct field of a gcthing.
*/
class InternalHandleBase
{
protected:
static void * const zeroPointer;
};
template <typename T>
class InternalHandle { };
template <typename T>
class InternalHandle<T*> : public InternalHandleBase
class InternalHandle<T*>
{
void * const *holder;
size_t offset;
@ -316,7 +310,7 @@ class InternalHandle<T*> : public InternalHandleBase
* fromMarkedLocation().
*/
InternalHandle(T *field)
: holder(reinterpret_cast<void * const *>(&zeroPointer)),
: holder(reinterpret_cast<void * const *>(&NullPtr::constNullValue)),
offset(uintptr_t(field))
{
}

2
js/src/jsgc.cpp
View File

@ -114,8 +114,6 @@ using namespace js::gc;
namespace js {
void * const InternalHandleBase::zeroPointer = NULL;
namespace gc {
/*