From 263e6772cecb91cf26295c48f9ac3b0701ca4ab2 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 14 Oct 2015 14:58:07 +0200
Subject: Simplify available_package_id comparison

---
 bpkg/package.cxx | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'bpkg/package.cxx')

diff --git a/bpkg/package.cxx b/bpkg/package.cxx
index 2612cbe..064dadd 100644
--- a/bpkg/package.cxx
+++ b/bpkg/package.cxx
@@ -19,22 +19,7 @@ namespace bpkg
   operator< (const available_package_id& x, const available_package_id& y)
   {
     int r (x.name.compare (y.name));
-
-    if (r != 0)
-      return r < 0;
-
-    const auto& xv (x.version);
-    const auto& yv (y.version);
-
-    if (xv.epoch != yv.epoch)
-      return xv.epoch < yv.epoch;
-
-    r = xv.canonical_upstream.compare (yv.canonical_upstream);
-
-    if (r != 0)
-      return r < 0;
-
-    return xv.revision < yv.revision;
+    return r != 0 ? r < 0 : x.version < y.version;
   }
 
   // available_package
-- 
cgit v1.1