---

yaml
---
r: 3545
b: refs/heads/master
c: 02a5949
h: refs/heads/master
i:
  3543: 9511681
v: v3

Author: robarnold

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73cc624e8e326f54eb0ea8bff70388d62dccd3cb
+refs/heads/master: 02a5949abaa4e888ecb470023ea2f29cd6bde43b

trunk/src/rt/rust_internal.h

@@ -97,19 +97,18 @@ static intptr_t const CONST_REFCOUNT = 0x7badface;
 static size_t const BUF_BYTES = 2048;
 
 // Every reference counted object should derive from this base class.
+// Or use this macro. The macro is preferred as the base class will be
+// disappearing.
 
-template <typename T> struct rc_base {
-    intptr_t ref_count;
-
-    void ref() {
-        ++ref_count;
-    }
+#define RUST_REFCOUNTED(T) \
+  RUST_REFCOUNTED_WITH_DTOR(T, delete (T*)this)
+#define RUST_REFCOUNTED_WITH_DTOR(T, dtor) \
+  intptr_t ref_count;      \
+  void ref() { ++ref_count; } \
+  void deref() { if (--ref_count == 0) { dtor; } }
 
-    void deref() {
-        if (--ref_count == 0) {
-            delete (T*)this;
-        }
-    }
+template <typename T> struct rc_base {
+    RUST_REFCOUNTED(T)
 
     rc_base();
     ~rc_base();