From aa950d1821afffe76676a4c856f44ceda4bf8501 Mon Sep 17 00:00:00 2001 From: twanvl Date: Tue, 3 Jun 2008 19:26:23 +0000 Subject: [PATCH] Use smart_less when sorting collections git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@967 0fc631ac-6414-0410-93d0-97cfa31319b6 --- src/script/functions/basic.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/script/functions/basic.cpp b/src/script/functions/basic.cpp index 394a06cd..fec66ef1 100644 --- a/src/script/functions/basic.cpp +++ b/src/script/functions/basic.cpp @@ -201,6 +201,10 @@ int position_in_vector(const ScriptValueP& of, const ScriptValueP& in, const Scr return -1; // TODO? } +inline bool smart_less_first(const pair& a, const pair& b) { + return smart_less(a.first, b.first); +} + // sort a script list ScriptValueP sort_script(Context& ctx, const ScriptValueP& list, ScriptValue& order_by) { ScriptType list_t = list->type(); @@ -219,7 +223,7 @@ ScriptValueP sort_script(Context& ctx, const ScriptValueP& list, ScriptValue& or ctx.setVariable(set ? _("card") : _("input"), v); values.push_back(make_pair(order_by.eval(ctx)->toString(), v)); } - sort(values.begin(), values.end()); + sort(values.begin(), values.end(), smart_less_first); // return collection intrusive_ptr ret(new ScriptCustomCollection()); FOR_EACH(v, values) {