From ea24cc431bf19ef7bc1c6eae09bd8101c3580353 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Sun, 31 Mar 2013 17:22:13 -0300 Subject: [PATCH] - Cosmetics --- modules/std/collection/cqueue.cc | 1 - modules/std/collection/cqueue.h | 4 +--- modules/std/collection/cset.cc | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/std/collection/cqueue.cc b/modules/std/collection/cqueue.cc index a866528e..3c305913 100644 --- a/modules/std/collection/cqueue.cc +++ b/modules/std/collection/cqueue.cc @@ -119,7 +119,6 @@ CLEVER_TYPE_INIT(CQueue::init) addMethod(new Function("back", (MethodPtr)&CQueue::back)); } -/*PriorityQueue*/ bool operator<(const CPQValue& a, const CPQValue& b) { ::std::vector args; diff --git a/modules/std/collection/cqueue.h b/modules/std/collection/cqueue.h index b444baf8..d7587491 100644 --- a/modules/std/collection/cqueue.h +++ b/modules/std/collection/cqueue.h @@ -13,7 +13,6 @@ namespace clever { namespace modules { namespace std { -/*PriorityQueue*/ struct CPQValue { CPQValue(Value* elem, const Function* func_, const VM* vm_) : element(elem), comp(func_), vm(vm_) {} @@ -34,10 +33,9 @@ struct CPQObject : public TypeObject { ~CPQObject() { while (!pq.empty()) { - delete pq.top().element; + clever_delref(pq.top().element); pq.pop(); } - } ::std::priority_queue pq; diff --git a/modules/std/collection/cset.cc b/modules/std/collection/cset.cc index 9602d76d..08b0561d 100644 --- a/modules/std/collection/cset.cc +++ b/modules/std/collection/cset.cc @@ -178,8 +178,7 @@ CLEVER_METHOD(CSet::ctor) return; } - result->setObj(this, - new CSetObject(static_cast(args[0]->getObj()))); + result->setObj(this, new CSetObject(comp)); } // Set.insert(Object element)