aboutsummaryrefslogtreecommitdiffstats
path: root/Token.h
diff options
context:
space:
mode:
authorjhuntley <jhuntley@houghtonassociates.com>2015-01-24 02:27:56 +0800
committerjhuntley <jhuntley@houghtonassociates.com>2015-03-05 00:17:46 +0800
commita4d772315d814408c057a9473c2c1fefa351a5b4 (patch)
tree3ad39c07bdec401f4aaeaa48ded5e20e5c4b1c7c /Token.h
parent055f45f11b89f5f0b10302c211bab3534f48cad2 (diff)
downloaddexon-solidity-a4d772315d814408c057a9473c2c1fefa351a5b4.tar
dexon-solidity-a4d772315d814408c057a9473c2c1fefa351a5b4.tar.gz
dexon-solidity-a4d772315d814408c057a9473c2c1fefa351a5b4.tar.bz2
dexon-solidity-a4d772315d814408c057a9473c2c1fefa351a5b4.tar.lz
dexon-solidity-a4d772315d814408c057a9473c2c1fefa351a5b4.tar.xz
dexon-solidity-a4d772315d814408c057a9473c2c1fefa351a5b4.tar.zst
dexon-solidity-a4d772315d814408c057a9473c2c1fefa351a5b4.zip
Consolidating macro resolution to one header file as per project owner request. Added inline comments covering reasons for undef of macros. Resolves issues with problem #832:
Adding UndefWindowsMacros.h to handle V8 CPP conflicts in Windows #832
Diffstat (limited to 'Token.h')
-rw-r--r--Token.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/Token.h b/Token.h
index 24b06d16..19afaee3 100644
--- a/Token.h
+++ b/Token.h
@@ -46,17 +46,7 @@
#include <libdevcore/Log.h>
#include <libsolidity/Utils.h>
#include <libsolidity/Exceptions.h>
-
-#if defined(DELETE)
-#undef DELETE
-#endif
-
-// Updates for mingw support. #undef conflicting defines which have been
-// repurposed for TOKEN_LIST on windows.
-#if defined(_MSC_VER) || defined(__MINGW32__)
-#undef IN
-#undef CONST
-#endif
+#include <libdevcore/UndefMacros.h>
namespace dev
{