From b03517a7484658f067f8b272ce45398b2bf66017 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 6 Apr 2008 14:57:41 +0000
Subject: [PATCH] Added vc_combine2().

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7855
---
 exp-drd/drd_vc.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/exp-drd/drd_vc.h b/exp-drd/drd_vc.h
index 6135ca97e..3737880bf 100644
--- a/exp-drd/drd_vc.h
+++ b/exp-drd/drd_vc.h
@@ -69,6 +69,7 @@ void vc_copy(VectorClock* const new,
              const VectorClock* const rhs);
 void vc_assign(VectorClock* const lhs,
                const VectorClock* const rhs);
+UInt vc_get(VectorClock* const vc, const ThreadId tid);
 void vc_increment(VectorClock* const vc, ThreadId const threadid);
 Bool vc_lte(const VectorClock* const vc1,
             const VectorClock* const vc2);
@@ -78,6 +79,9 @@ void vc_min(VectorClock* const result,
             const VectorClock* const rhs);
 void vc_combine(VectorClock* const result,
                 const VectorClock* const rhs);
+Bool vc_combine2(VectorClock* const result,
+                 const VectorClock* const rhs,
+                 const ThreadId tid);
 void vc_print(const VectorClock* const vc);
 void vc_snprint(Char* const str, Int const size,
                 const VectorClock* const vc);