From 27c2138882ac54b1ba51583d9fd52ca2303e8fc8 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Thu, 8 Feb 2007 20:59:11 -0800 Subject: [PATCH] Use c99 variadic macros for non gnu compilers --HG-- extra : convert_revision : 4e9fda42e9f5ed3e9f66e5bd178c45537792073b --- src/base/trace.hh | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/base/trace.hh b/src/base/trace.hh index 55dd1bd4e..739f7fe03 100644 --- a/src/base/trace.hh +++ b/src/base/trace.hh @@ -183,36 +183,36 @@ inline const std::string &name() { return Trace::DefaultName; } #define DTRACE(x) (Trace::IsOn(Trace::x)) -#define DDUMP(x, data, count) do { \ - if (DTRACE(x)) \ - Trace::dataDump(curTick, name(), data, count); \ +#define DDUMP(x, data, count) do { \ + if (DTRACE(x)) \ + Trace::dataDump(curTick, name(), data, count); \ } while (0) -#define DPRINTF(x, args...) do { \ - if (DTRACE(x)) \ - Trace::dprintf(curTick, name(), args); \ +#define DPRINTF(x, ...) do { \ + if (DTRACE(x)) \ + Trace::dprintf(curTick, name(), __VA_ARGS__); \ } while (0) -#define DPRINTFR(x, args...) do { \ - if (DTRACE(x)) \ - Trace::dprintf((Tick)-1, std::string(), args); \ +#define DPRINTFR(x, ...) do { \ + if (DTRACE(x)) \ + Trace::dprintf((Tick)-1, std::string(), __VA_ARGS__); \ } while (0) -#define DPRINTFN(args...) do { \ - Trace::dprintf(curTick, name(), args); \ +#define DPRINTFN(...) do { \ + Trace::dprintf(curTick, name(), __VA_ARGS__); \ } while (0) -#define DPRINTFNR(args...) do { \ - Trace::dprintf((Tick)-1, string(), args); \ +#define DPRINTFNR(...) do { \ + Trace::dprintf((Tick)-1, string(), __VA_ARGS__); \ } while (0) #else // !TRACING_ON #define DTRACE(x) (false) -#define DPRINTF(x, args...) do {} while (0) -#define DPRINTFR(args...) do {} while (0) -#define DPRINTFN(args...) do {} while (0) -#define DPRINTFNR(args...) do {} while (0) +#define DPRINTF(x, ...) do {} while (0) +#define DPRINTFR(...) do {} while (0) +#define DPRINTFN(...) do {} while (0) +#define DPRINTFNR(...) do {} while (0) #define DDUMP(x, data, count) do {} while (0) #endif // TRACING_ON -- 2.30.2