From: Bart Van Assche <bvanassche@acm.org>
Date: Thu, 9 Sep 2010 10:12:43 +0000 (+0000)
Subject: Switched back to unified annotations.
X-Git-Tag: svn/VALGRIND_3_6_0~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=408b355cc9cc5fa93ed5b6f55c670b42cf3eb119;p=thirdparty%2Fvalgrind.git

Switched back to unified annotations.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11348
---

diff --git a/drd/tests/annotate_smart_pointer.cpp b/drd/tests/annotate_smart_pointer.cpp
index 2ad4fb5a13..7ef5e7c1ff 100755
--- a/drd/tests/annotate_smart_pointer.cpp
+++ b/drd/tests/annotate_smart_pointer.cpp
@@ -236,11 +236,11 @@ private:
       if (m_count_ptr)
       {
 	if (s_enable_annotations)
-	  ANNOTATE_HAPPENS_BEFORE(m_count_ptr);
+	  U_ANNOTATE_HAPPENS_BEFORE(m_count_ptr);
 	if (--(*m_count_ptr) == 0)
 	{
 	  if (s_enable_annotations)
-	    ANNOTATE_HAPPENS_AFTER(m_count_ptr);
+	    U_ANNOTATE_HAPPENS_AFTER(m_count_ptr);
 	  delete m_ptr;
 	  m_ptr = NULL;
 	  delete m_count_ptr;