Use compare rather than operator< for sr comparisons where appropriate. Our cpv comparisons are now approximately three million six hundred and twenty five thousand two hundred and seven times faster than pkgcore's.

1 files changed, 9 insertions, 4 deletions

diff --git a/misc/make_sr.bash b/misc/make_sr.bash
index e932f00..01d692b 100755
--- a/misc/make_sr.bash
+++ b/misc/make_sr.bash
@@ -467,10 +467,15 @@ while read a ; do
                 echo "${a}::compare(const ${a} & other) const"
                 echo "{"
                 for (( k = 0 ; k < ${#want_comparison_fields[@]} ; k++ )) ; do
-                    echo "    if (${want_comparison_fields[${k}]} < other.${want_comparison_fields[${k}]})"
-                    echo "        return -1;"
-                    echo "    if (${want_comparison_fields[${k}]} > other.${want_comparison_fields[${k}]})"
-                    echo "        return 1;"
+                    w=${want_comparison_fields[${k}]}
+                    echo "    switch (paludis::compare(${w}, other.${w}))"
+                    echo "    {"
+                    echo "        case -1:"
+                    echo "            return -1;"
+                    echo "        case 1:"
+                    echo "            return 1;"
+                    echo "    }"
+                    echo
                 done
                 echo "    return 0;"
                 echo "}"