Remove redundant function in Array

get() and getArrayData() do the same thing.
Esse commit está contido em:
Jordan DeLong
2013-07-07 15:49:55 -07:00
commit de Sara Golemon
commit 1c764cabf0
3 arquivos alterados com 3 adições e 7 exclusões
+2 -2
Ver Arquivo
@@ -688,7 +688,7 @@ bool Iter::init(TypedValue* c1) {
Class* ctx = arGetContextClass(g_vmContext->getFP());
CStrRef ctxStr = ctx ? ctx->nameRef() : null_string;
Array iterArray(obj->o_toIterArray(ctxStr));
ArrayData* ad = iterArray.getArrayData();
ArrayData* ad = iterArray.get();
(void) new (&arr()) ArrayIter(ad);
}
}
@@ -1075,7 +1075,7 @@ static int64_t new_iter_object_any(Iter* dest, ObjectData* obj, Class* ctx,
__func__, dest, obj, ctx);
CStrRef ctxStr = ctx ? ctx->nameRef() : null_string;
Array iterArray(itObj->o_toIterArray(ctxStr));
ArrayData* ad = iterArray.getArrayData();
ArrayData* ad = iterArray.get();
(void) new (&dest->arr()) ArrayIter(ad);
itType = ArrayIter::TypeArray;
}
+1 -1
Ver Arquivo
@@ -464,7 +464,7 @@ Variant ArrayUtil::CountValues(CArrRef input) {
Array ArrayUtil::EnsureIntKeys(CArrRef input) {
assert(!input.isNull());
if (!input.getArrayData()->isVectorData()) {
if (!input.get()->isVectorData()) {
return input.values();
}
return input;
-4
Ver Arquivo
@@ -450,10 +450,6 @@ class Array : protected SmartPtr<ArrayData> {
void dump();
ArrayData *getArrayData() const {
return m_px;
}
void setEvalScalar() const;
private: