From 5c392c24398b95df09e474b15691d4159eb38efd Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Fri, 29 Sep 2006 00:16:28 +0000 Subject: Fixes to compile on amd64 (plp_inttypes.h) and with gcc >= 4.1 (the rest); patches from Debian bugs #384146, #386833 and #388831. --- lib/Enum.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib/Enum.h') diff --git a/lib/Enum.h b/lib/Enum.h index d4ffe19..5841b2a 100644 --- a/lib/Enum.h +++ b/lib/Enum.h @@ -304,14 +304,16 @@ template typename Enum::sdata Enum::staticData; * The definition of the static variable holding the static * data for this Enumeration wrapper. */ -#define ENUM_DEFINITION(EnumName, initWith) \ -template Enum< EnumName >::sdata Enum< EnumName >::staticData; \ +#define ENUM_DEFINITION_BEGIN(EnumName, initWith) \ /** \ * actual definition of the constructor for the static data. \ * This is called implicitly by the definition above. \ */ \ template <> Enum::sdata::sdata() : \ -name(#EnumName),defaultValue(initWith) + name(#EnumName),defaultValue(initWith) { + +#define ENUM_DEFINITION_END(EnumName) \ +} template Enum< EnumName >::sdata Enum< EnumName >::staticData; /** * Writes enumeration's string representation. -- cgit v1.2.3