Bug 865940. Remove AsMutable now that our binding stack variables aren't const. r=bholley

This commit is contained in:
Boris Zbarsky 2013-04-25 22:46:18 -04:00
Родитель e95e3e9eea
Коммит 2d1373eb86
3 изменённых файлов: 2 добавлений и 16 удалений

Просмотреть файл

@ -265,11 +265,6 @@ public:
return mImpl.ref();
}
Optional& AsMutable() const
{
return *const_cast<Optional*>(this);
}
// If we ever decide to add conversion operators for optional arrays
// like the ones Nullable has, we'll need to ensure that Maybe<> has
// the boolean before the actual data.

Просмотреть файл

@ -4051,7 +4051,7 @@ def wrapTypeIntoCurrentCompartment(type, value):
if type.isSequence():
if type.nullable():
type = type.inner
value = "%s.AsMutable().Value()" % value
value = "%s.Value()" % value
global sequenceWrapLevel
index = "indexName%d" % sequenceWrapLevel
sequenceWrapLevel += 1
@ -4067,7 +4067,6 @@ def wrapTypeIntoCurrentCompartment(type, value):
if type.isDictionary():
assert not type.nullable()
value = "%s.AsMutable()" % value
myDict = type.inner
memberWraps = []
while myDict:
@ -4099,7 +4098,7 @@ def wrapArgIntoCurrentCompartment(arg, value):
origValue = value
isOptional = arg.optional and not arg.defaultValue
if isOptional:
value = value + ".AsMutable().Value()"
value = value + ".Value()"
wrap = wrapTypeIntoCurrentCompartment(arg.type, value)
if wrap and isOptional:
wrap = CGIfWrapper(wrap, "%s.WasPassed()" % origValue)
@ -7188,10 +7187,6 @@ class CGDictionary(CGThing):
" NS_ENSURE_TRUE(cx, false);\n"
" return Init(cx, json.ref());\n"
" }\n" if not self.workers else "") +
" ${selfName}& AsMutable() const\n"
" {\n"
" return *const_cast<${selfName}*>(this);\n"
" }\n"
"\n" +
"\n".join(memberDecls) + "\n"
"private:\n"

Просмотреть файл

@ -64,10 +64,6 @@ public:
return mIsNull;
}
Nullable& AsMutable() const {
return *const_cast<Nullable*>(this);
}
// Make it possible to use a const Nullable of an array type with other
// array types.
template<typename U>