diff options
| author |  Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2013-04-19 17:59:27 -0700 |
|---|---|---|
| committer | Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2013-04-19 17:59:49 -0700 |
| commit | d6f6992e9617d3b981c0e14054973ea47ba4cafe (patch) | |
| tree | dc66401f4e5de1da7234e465dc3616bcff505acf /src/core | |
| parent | 6c13147d61ea7046e4b786457d8e84fd9dc40517 (diff) | |
Fixed sortedArray implementation
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/basetypes/MCArray.cc | 6 | ||||
| -rw-r--r-- | src/core/basetypes/MCArray.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/basetypes/MCArray.cc b/src/core/basetypes/MCArray.cc index 73921085..c77d29ad 100644 --- a/src/core/basetypes/MCArray.cc +++ b/src/core/basetypes/MCArray.cc @@ -204,7 +204,7 @@ static int sortCompare(Object ** pa, Object ** pb, struct sortData * data) return data->compare(a, b, data->context); } -Array * Array::sortedArray(int (* compare)(void *, void *, void *), void * context) +Array * Array::sortedArray(int (* compare)(void * a, void * b, void * context), void * context) { struct sortData data; Array * result = (Array *) this->copy()->autorelease(); @@ -212,13 +212,13 @@ Array * Array::sortedArray(int (* compare)(void *, void *, void *), void * conte data.context = context; #ifdef __MACH__ qsort_r(carray_data(result->mArray), carray_count(result->mArray), - sizeof(* carray_data(result->mArray)), this, + sizeof(* carray_data(result->mArray)), &data, (int (*)(void *, const void *, const void *)) sortCompare); #else qsort_r(carray_data(result->mArray), carray_count(result->mArray), sizeof(* carray_data(result->mArray)), (int (*)(const void *, const void *, void *)) sortCompare, - this); + &data); #endif return result; } diff --git a/src/core/basetypes/MCArray.h b/src/core/basetypes/MCArray.h index ebbf1e5f..564924f8 100644 --- a/src/core/basetypes/MCArray.h +++ b/src/core/basetypes/MCArray.h @@ -34,7 +34,7 @@ namespace mailcore { virtual Object * lastObject(); virtual bool containsObject(Object * obj); - virtual Array * sortedArray(int (* compare)(void *, void *, void *), void * context); + virtual Array * sortedArray(int (* compare)(void * a, void * b, void * context), void * context); virtual String * componentsJoinedByString(String * delimiter); public: // subclass behavior |