diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-12-18 22:30:27 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-12-18 22:30:27 +0000 |
commit | d0cadcf187a8a8b0875f054420842015d33211cb (patch) | |
tree | dae2cafac571836d1cdf9299e138f7e6663cf78d /Build/source/libs/harfbuzz/harfbuzz-src/src/hb-debug.hh | |
parent | c4538b34b2360d1f67bb9dee0ec29af2bf35e8a3 (diff) |
harfbuzz-1.7.3
git-svn-id: svn://tug.org/texlive/trunk@46090 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src/hb-debug.hh')
-rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-src/src/hb-debug.hh | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-debug.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-debug.hh index 20dead65b65..6c425f7b9dd 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-debug.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-debug.hh @@ -93,7 +93,7 @@ _hb_debug_msg_va (const char *what, fprintf (stderr, "%-10s", what ? what : ""); if (obj) - fprintf (stderr, "(%0*lx) ", (unsigned int) (2 * sizeof (void *)), (unsigned long) obj); + fprintf (stderr, "(%*p) ", (unsigned int) (2 * sizeof (void *)), obj); else fprintf (stderr, " %*s ", (unsigned int) (2 * sizeof (void *)), ""); @@ -220,8 +220,8 @@ template <> {} template <int max_level, typename ret_t> -struct hb_auto_trace_t { - +struct hb_auto_trace_t +{ explicit inline hb_auto_trace_t (unsigned int *plevel_, const char *what_, const void *obj_, @@ -269,7 +269,17 @@ struct hb_auto_trace_t { bool returned; }; template <typename ret_t> /* Make sure we don't use hb_auto_trace_t when not tracing. */ -struct hb_auto_trace_t<0, ret_t>; +struct hb_auto_trace_t<0, ret_t> +{ + explicit inline hb_auto_trace_t (unsigned int *plevel_, + const char *what_, + const void *obj_, + const char *func, + const char *message, + ...) HB_PRINTF_FUNC(6, 7) {} + + inline ret_t ret (ret_t v, unsigned int line HB_UNUSED = 0) { return v; } +}; /* For disabled tracing; optimize out everything. * https://github.com/harfbuzz/harfbuzz/pull/605 */ |