- Cosmetics

clever-lang · Mar 31, 2013 · ea24cc4 · ea24cc4
1 parent b372727
commit ea24cc4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git 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<Value*> args;

diff --git 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<CPQValue> pq;

diff --git 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<Function*>(args[0]->getObj())));
+	result->setObj(this, new CSetObject(comp));
 }
 
 // Set.insert(Object element)