Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Converted to CodeWarrior 6 and fixed errors

Browse Source
This commit is contained in:
waldemar%netscape.com 2000-12-16 01:14:55 +00:00
parent a86b8ebf19
commit 157324e348
6 changed files with 18 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/js2/jsclasses.h
View File

@ -143,8 +143,7 @@ namespace JSClasses {
if (slti == mSlots.end())
defineSlot(name, type, JSSlot::kNoFlag, getter, 0);
else {
if (slti->second.mActual)
ASSERT(slti->second.isVirtual());
ASSERT(!slti->second.mActual || slti->second.isVirtual());
ASSERT(slti->second.mGetter == 0);
slti->second.mGetter = getter;
slti->second.mActual = false;
@ -159,8 +158,7 @@ namespace JSClasses {
defineSlot(name, type, JSSlot::kNoFlag, 0, setter);
else {
JSSlot &s = slti->second;
if (s.mActual)
ASSERT(s.isVirtual());
ASSERT(!s.mActual || s.isVirtual());
ASSERT(s.mSetter == 0);
s.mSetter = setter;
s.mActual = false;
@ -353,11 +351,9 @@ namespace JSClasses {
return gc_base::operator new(n);
}
#if !defined(XP_MAC)
void operator delete(void* /*ptr*/) {}
void operator delete(void* /*ptr*/, JSClass* /*thisClass*/) {}
void operator delete(void* /*ptr*/, uint32 /*slotCount*/) {}
#endif
JSInstance(uint32 slotCount)
{

BIN
js/js2/macbuild/JS2.mcp
View File

Binary file not shown.

20
js/js2/utilities.h
View File

@ -448,10 +448,8 @@ namespace JavaScript {
struct ArenaObject {
void *operator new(size_t size, Arena &arena) {return arena.allocate(size);}
void *operator new[](size_t size, Arena &arena) {return arena.allocate(size);}
#ifndef __MWERKS__ // Metrowerks 5.3 bug: These aren't supported yet
void operator delete(void *, Arena &) {}
void operator delete[](void *, Arena &) {}
#endif
private:
void operator delete(void *, size_t) {}
void operator delete[](void *) {}
@ -1503,19 +1501,15 @@ inline void *operator new(size_t size, JavaScript::Arena &arena) {return arena.a
inline void *operator new[](size_t size, JavaScript::Arena &arena) {return arena.allocate(size);}
#endif
#ifndef __MWERKS__ // Metrowerks 5.3 bug: Two-argument delete isn't supported yet
// Global delete operators. These are only called in the rare cases that a constructor throws an exception
// and has to undo an operator new. An explicit delete statement will never invoke these.
inline void operator delete(void *, JavaScript::Arena &) {}
#ifndef _WIN32 // Microsoft Visual C++ 6.0 bug: new and new[] aren't distinguished
inline void operator delete[](void *, JavaScript::Arena &) {}
#endif
// Global delete operators. These are only called in the rare cases that a constructor throws an exception
// and has to undo an operator new. An explicit delete statement will never invoke these.
inline void operator delete(void *, JavaScript::Arena &) {}
#ifndef _WIN32 // Microsoft Visual C++ 6.0 bug: new and new[] aren't distinguished
inline void operator delete[](void *, JavaScript::Arena &) {}
#endif
template <typename T>
inline void *operator new(size_t DEBUG_ONLY(size), JavaScript::Pool<T> &pool) {ASSERT(size == sizeof(T)); return pool.allocate();}
#ifndef __MWERKS__ // Metrowerks 5.3 bug: Two-argument delete isn't supported yet
template <typename T>
inline void operator delete(void *t, JavaScript::Pool<T> &pool) {pool.deallocate(t);}
#endif
template <typename T>
inline void operator delete(void *t, JavaScript::Pool<T> &pool) {pool.deallocate(t);}
#endif

8
js2/src/jsclasses.h
View File

@ -143,8 +143,7 @@ namespace JSClasses {
if (slti == mSlots.end())
defineSlot(name, type, JSSlot::kNoFlag, getter, 0);
else {
if (slti->second.mActual)
ASSERT(slti->second.isVirtual());
ASSERT(!slti->second.mActual || slti->second.isVirtual());
ASSERT(slti->second.mGetter == 0);
slti->second.mGetter = getter;
slti->second.mActual = false;
@ -159,8 +158,7 @@ namespace JSClasses {
defineSlot(name, type, JSSlot::kNoFlag, 0, setter);
else {
JSSlot &s = slti->second;
if (s.mActual)
ASSERT(s.isVirtual());
ASSERT(!s.mActual || s.isVirtual());
ASSERT(s.mSetter == 0);
s.mSetter = setter;
s.mActual = false;
@ -353,11 +351,9 @@ namespace JSClasses {
return gc_base::operator new(n);
}
#if !defined(XP_MAC)
void operator delete(void* /*ptr*/) {}
void operator delete(void* /*ptr*/, JSClass* /*thisClass*/) {}
void operator delete(void* /*ptr*/, uint32 /*slotCount*/) {}
#endif
JSInstance(uint32 slotCount)
{

BIN
js2/src/macbuild/JS2.mcp
View File

Binary file not shown.

20
js2/src/utilities.h
View File

@ -448,10 +448,8 @@ namespace JavaScript {
struct ArenaObject {
void *operator new(size_t size, Arena &arena) {return arena.allocate(size);}
void *operator new[](size_t size, Arena &arena) {return arena.allocate(size);}
#ifndef __MWERKS__ // Metrowerks 5.3 bug: These aren't supported yet
void operator delete(void *, Arena &) {}
void operator delete[](void *, Arena &) {}
#endif
private:
void operator delete(void *, size_t) {}
void operator delete[](void *) {}
@ -1503,19 +1501,15 @@ inline void *operator new(size_t size, JavaScript::Arena &arena) {return arena.a
inline void *operator new[](size_t size, JavaScript::Arena &arena) {return arena.allocate(size);}
#endif
#ifndef __MWERKS__ // Metrowerks 5.3 bug: Two-argument delete isn't supported yet
// Global delete operators. These are only called in the rare cases that a constructor throws an exception
// and has to undo an operator new. An explicit delete statement will never invoke these.
inline void operator delete(void *, JavaScript::Arena &) {}
#ifndef _WIN32 // Microsoft Visual C++ 6.0 bug: new and new[] aren't distinguished
inline void operator delete[](void *, JavaScript::Arena &) {}
#endif
// Global delete operators. These are only called in the rare cases that a constructor throws an exception
// and has to undo an operator new. An explicit delete statement will never invoke these.
inline void operator delete(void *, JavaScript::Arena &) {}
#ifndef _WIN32 // Microsoft Visual C++ 6.0 bug: new and new[] aren't distinguished
inline void operator delete[](void *, JavaScript::Arena &) {}
#endif
template <typename T>
inline void *operator new(size_t DEBUG_ONLY(size), JavaScript::Pool<T> &pool) {ASSERT(size == sizeof(T)); return pool.allocate();}
#ifndef __MWERKS__ // Metrowerks 5.3 bug: Two-argument delete isn't supported yet
template <typename T>
inline void operator delete(void *t, JavaScript::Pool<T> &pool) {pool.deallocate(t);}
#endif
template <typename T>
inline void operator delete(void *t, JavaScript::Pool<T> &pool) {pool.deallocate(t);}
#endif