From 9c8963e3fe35f76c945ce9e5fb505610e99b4ab9 Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Fri, 8 Jun 2012 17:12:29 -0700 Subject: [PATCH] Tinyformat: change definitions to fix errors on some compilers. --- src/include/tinyformat.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/include/tinyformat.h b/src/include/tinyformat.h index c06674a328..ad8b3b75a3 100644 --- a/src/include/tinyformat.h +++ b/src/include/tinyformat.h @@ -851,6 +851,11 @@ returnType funcName(TINYFORMAT_WRAP_FORMAT_EXTRA_ARGS const char* fmt cog.outl() ]]]*/ +#ifndef TINYFORMAT_WRAP_FORMAT_EXTRA_ARGS +#define TINYFORMAT_WRAP_FORMAT_EXTRA_ARGS +#endif + + #define TINYFORMAT_WRAP_FORMAT(returnType, funcName, funcDeclSuffix, \ bodyPrefix, streamName, bodySuffix) \ inline \ @@ -1008,6 +1013,7 @@ void printf(const char* fmt, const Args&... args) // template // void format(std::ostream& out, const char* fmt, const Args&... args) +#undef TINYFORMAT_WRAP_FORMAT_EXTRA_ARGS #define TINYFORMAT_WRAP_FORMAT_EXTRA_ARGS std::ostream& out, TINYFORMAT_WRAP_FORMAT(void, format, /*empty*/, /*empty*/, out, /*empty*/) #undef TINYFORMAT_WRAP_FORMAT_EXTRA_ARGS