From 2c9d6485a1f89c11f84e720d3c7978dc11a5039a Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Fri, 23 Nov 2012 16:49:19 -0500
Subject: [PATCH] More tracing fixup

---
 src/hb-private.hh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/hb-private.hh b/src/hb-private.hh
index b5d417ce8..feab7cad1 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -720,7 +720,7 @@ struct hb_auto_trace_t {
     if (plevel) --*plevel;
   }
 
-  inline ret_t &ret (ret_t &v, unsigned int line = 0)
+  inline ret_t ret (ret_t v, unsigned int line = 0)
   {
     if (unlikely (returned)) {
       fprintf (stderr, "OUCH, double calls to TRACE_RETURN.  This is a bug, please report.\n");
@@ -751,8 +751,7 @@ struct hb_auto_trace_t<0, ret_t> {
 				   const char *message HB_UNUSED,
 				   ...) {}
 
-  template <typename T>
-  inline T ret (T v, unsigned int line = 0) { return v; }
+  inline ret_t ret (ret_t v, unsigned int line = 0) { return v; }
 };
 
 #define TRACE_RETURN(RET) trace.ret (RET, __LINE__)