diff -r 290510e58445 -r 635d7dfdb8a3 src/base/cp_annotate.hh
--- a/src/base/cp_annotate.hh	Mon Sep 29 11:41:08 2014 +0100
+++ b/src/base/cp_annotate.hh	Mon Sep 29 11:41:27 2014 +0100
@@ -45,6 +45,7 @@
 
 #include <list>
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -189,7 +190,7 @@
         }
 
     /* struct that is written to the annotation output file */
-    struct AnnotateData : public RefCounted {
+    struct AnnotateData {
 
         Tick time;
         uint32_t data;
@@ -206,7 +207,7 @@
 
     };
 
-    typedef RefCountingPtr<AnnotateData> AnnDataPtr;
+    typedef std::shared_ptr<AnnotateData> AnnDataPtr;
 
     /* header for the annotation file */
     struct AnnotateHeader {
diff -r 290510e58445 -r 635d7dfdb8a3 src/base/cp_annotate.cc
--- a/src/base/cp_annotate.cc	Mon Sep 29 11:41:08 2014 +0100
+++ b/src/base/cp_annotate.cc	Mon Sep 29 11:41:27 2014 +0100
@@ -822,7 +822,7 @@
 CPA::AnnDataPtr
 CPA::add(int t, int f, int c, int sm, int stq, int32_t d)
 {
-    AnnDataPtr an = new AnnotateData;
+    AnnDataPtr an = std::make_shared<AnnotateData>();
     an->time = curTick();
     an->data = d;
     an->orig_data = d;
@@ -1373,7 +1373,7 @@
         if (!qSize[x])
             continue;
         for (int y = 0; y < qSize[x]; y++) {
-            AnnDataPtr a = new AnnotateData;
+            AnnDataPtr a = std::make_shared<AnnotateData>();
             a->unserialize(cp, csprintf("%s.Q%d_%d", section, x, y));
             data.push_back(a);
             qData[x].push_back(a);