Changeset 756 for trunk/lib

Timestamp:

Jan 27, 2009, 12:13:28 AM (15 years ago)

Author:

Peter Johansson

Message:

refs #74 - using stl rather than home brewed in SVNlog::operator+=

Location:

trunk/lib

Files:

• Commitment.h (modified) (1 diff)
• SVNlog.cc (modified) (1 diff)

trunk/lib/Commitment.h

@@ -91 +91 @@
   };
 
+  struct LessRevision
+  {
+    inline bool operator()(const Commitment& lhs, const Commitment& rhs)
+    { return lhs.revision()<rhs.revision(); }
+  };
+
 }} // end of namespace svndigest and namespace theplu
 

trunk/lib/SVNlog.cc

@@ -114 +114 @@
   {
     SVNlog log;
-    std::vector<Commitment>::iterator lhs_iter=lhs.commits().begin();
-    std::vector<Commitment>::const_iterator rhs_iter=rhs.commits().begin();
-    while(lhs_iter<lhs.commits().end() && rhs_iter<rhs.commits().end()) {
-      if (lhs_iter->revision() < rhs_iter->revision()) {
-        
-        log.commits().push_back(*lhs_iter);
-        ++lhs_iter;
-      }
-      else if (rhs_iter->revision()<lhs_iter->revision()) {
-        log.commits().push_back(*rhs_iter);
-        ++rhs_iter;
-      }
-      else {
-        log.commits().push_back(*lhs_iter);
-        ++lhs_iter;
-        ++rhs_iter;
-      }
-    }
-    while(lhs_iter<lhs.commits().end()) {
-      log.commits().push_back(*lhs_iter);
-      ++lhs_iter;
-    }
-    while(rhs_iter<rhs.commits().end()) {
-      log.commits().push_back(*rhs_iter);
-      ++rhs_iter;
-    }
+    log.commits().reserve(std::max(lhs.commits().size(), rhs.commits().size()));
+    std::set_union(lhs.commits().begin(), lhs.commits().end(),
+                   rhs.commits().begin(), rhs.commits().end(),
+                   std::back_inserter(log.commits()), LessRevision());
     lhs.swap(log);
     return lhs;