diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-07-02 06:40:01 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2017-07-02 07:09:46 +0800 |
| commit | b615b01449984b21d7615d6daf70455a56e7bdbc (patch) | |
| tree | 865afcff8be40f538e97045f5934653ffce82d28 | |
| parent | d230048dc8385744203528115aa9bb5c0fba4339 (diff) | |
| download | dexon-solidity-b615b01449984b21d7615d6daf70455a56e7bdbc.tar.gz dexon-solidity-b615b01449984b21d7615d6daf70455a56e7bdbc.tar.zst dexon-solidity-b615b01449984b21d7615d6daf70455a56e7bdbc.zip | |
Move UndefMacros from libdevcore to libsolidity/parsing
| -rw-r--r-- | libsolidity/ast/Types.h | 1 | ||||
| -rw-r--r-- | libsolidity/parsing/Token.h | 2 | ||||
| -rw-r--r-- | libsolidity/parsing/UndefMacros.h (renamed from libdevcore/UndefMacros.h) | 2 | ||||
| -rw-r--r-- | test/RPCSession.h | 1 | ||||
| -rw-r--r-- | test/libsolidity/SolidityEndToEndTest.cpp | 2 |
5 files changed, 3 insertions, 5 deletions
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h index f7a73ab5..d031a74f 100644 --- a/libsolidity/ast/Types.h +++ b/libsolidity/ast/Types.h @@ -28,7 +28,6 @@ #include <libdevcore/Common.h> #include <libdevcore/CommonIO.h> -#include <libdevcore/UndefMacros.h> #include <boost/noncopyable.hpp> #include <boost/rational.hpp> diff --git a/libsolidity/parsing/Token.h b/libsolidity/parsing/Token.h index 39c0eff9..d412b3f0 100644 --- a/libsolidity/parsing/Token.h +++ b/libsolidity/parsing/Token.h @@ -44,7 +44,7 @@ #include <libdevcore/Common.h> #include <libsolidity/interface/Exceptions.h> -#include <libdevcore/UndefMacros.h> +#include <libsolidity/parsing/UndefMacros.h> namespace dev { diff --git a/libdevcore/UndefMacros.h b/libsolidity/parsing/UndefMacros.h index d2da3323..d96e242e 100644 --- a/libdevcore/UndefMacros.h +++ b/libsolidity/parsing/UndefMacros.h @@ -19,7 +19,7 @@ * @date 2015 * * This header should be used to #undef some really evil macros defined by - * windows.h which result in conflict with our libsolidity/Token.h + * windows.h which result in conflict with our Token.h */ #pragma once diff --git a/test/RPCSession.h b/test/RPCSession.h index f3c3339a..f7fdd86e 100644 --- a/test/RPCSession.h +++ b/test/RPCSession.h @@ -21,7 +21,6 @@ #if defined(_WIN32) #include <windows.h> -#include "libdevcore/UndefMacros.h" #else #include <sys/types.h> #include <sys/socket.h> diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index a6c01283..6fe2461c 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -9622,7 +9622,7 @@ BOOST_AUTO_TEST_CASE(scientific_notation) BOOST_CHECK(callContractFunction("k()") == encodeArgs(u256(-25))); } -BOOST_AUTO_TEST_CASE(interface) +BOOST_AUTO_TEST_CASE(interface_contract) { char const* sourceCode = R"( interface I { |