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

removed JSMap::operator[], added set/getPrototype().

Browse Source
This commit is contained in:
beard%netscape.com 2000-04-26 22:06:17 +00:00
parent 81365016bc
commit 328d338eaf
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/js2/jstypes.h
View File

@ -108,13 +108,16 @@ namespace JSTypes {
JSProperties mProperties;
JSMap* mPrototype;
public:
JSValue& operator[](const String& name)
const JSValue& getProperty(const String& name) const
{
<<<<<<< jstypes.h
=======
return mProperties[name];
}
const JSValue& getProperty(const String& name)
{
>>>>>>> 1.13
#ifdef XP_MAC
JSProperties::const_iterator i = mProperties.find(name);
if (i != mProperties.end())
@ -135,6 +138,16 @@ namespace JSTypes {
{
return (mProperties[name] = value);
}
void setPrototype(JSMap* prototype)
{
mPrototype = prototype;
}
JSMap* getPrototype()
{
return mPrototype;
}
};
/**

15
js2/src/jstypes.h
View File

@ -108,13 +108,16 @@ namespace JSTypes {
JSProperties mProperties;
JSMap* mPrototype;
public:
JSValue& operator[](const String& name)
const JSValue& getProperty(const String& name) const
{
<<<<<<< jstypes.h
=======
return mProperties[name];
}
const JSValue& getProperty(const String& name)
{
>>>>>>> 1.13
#ifdef XP_MAC
JSProperties::const_iterator i = mProperties.find(name);
if (i != mProperties.end())
@ -135,6 +138,16 @@ namespace JSTypes {
{
return (mProperties[name] = value);
}
void setPrototype(JSMap* prototype)
{
mPrototype = prototype;
}
JSMap* getPrototype()
{
return mPrototype;
}
};
/**