From d51036b3e2e2185655460c4e9cbdba3f5a9946dc Mon Sep 17 00:00:00 2001 From: jhuntley Date: Wed, 21 Jan 2015 11:06:43 -0500 Subject: [PATCH] Adding comments for #undef per project owner request. --- libsolidity/Token.h | 17 +++++++++++------ libsolidity/Types.h | 2 ++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/libsolidity/Token.h b/libsolidity/Token.h index 2c24f7aff..be6a37e5d 100644 --- a/libsolidity/Token.h +++ b/libsolidity/Token.h @@ -47,6 +47,17 @@ #include #include +#if defined(DELETE) +#undef DELETE +#endif + +// Updates for mingw support. #undef conflicting defines which have been +// repurposed for TOKEN_LIST on windows. +#if defined(__MINGW32__) +#undef IN +#undef CONST +#endif + namespace dev { namespace solidity @@ -65,12 +76,6 @@ namespace solidity // an argument (at any position) for a TOKEN_LIST call. It does // nothing with tokens belonging to the respective category. -#if defined(__MINGW32__) -#undef IN -#undef DELETE -#undef CONST -#endif - #define IGNORE_TOKEN(name, string, precedence) #define TOKEN_LIST(T, K) \ diff --git a/libsolidity/Types.h b/libsolidity/Types.h index 99c083c00..77fc66e9f 100644 --- a/libsolidity/Types.h +++ b/libsolidity/Types.h @@ -67,6 +67,8 @@ private: MemberMap m_memberTypes; }; +// Updates for mingw support. #undef conflicting defines which have been +// repurposed for TOKEN_LIST on windows. #if defined(__MINGW32__) #undef VOID #endif