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 2ad4fb5a13374ca1803234753733cbb80d20e6bf..7ef5e7c1ff1fc28f11b2886084b0840f89aefb3e 100755 (executable)
--- 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;