diff options
| author | chriseth <chris@ethereum.org> | 2018-08-06 17:55:01 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-06 17:55:01 +0800 |
| commit | 74e6067347eb822c2e107c29d6ea58f22b328de7 (patch) | |
| tree | f96cebd7c011543a64b568df42606b2fb8f26601 /libevmasm/KnownState.h | |
| parent | 3576980710e019165db272afb4fc5e80f8bd5bff (diff) | |
| parent | 6c3b48ddfcfb0849e1083cea8d4fae4446511be1 (diff) | |
| download | dexon-solidity-74e6067347eb822c2e107c29d6ea58f22b328de7.tar dexon-solidity-74e6067347eb822c2e107c29d6ea58f22b328de7.tar.gz dexon-solidity-74e6067347eb822c2e107c29d6ea58f22b328de7.tar.bz2 dexon-solidity-74e6067347eb822c2e107c29d6ea58f22b328de7.tar.lz dexon-solidity-74e6067347eb822c2e107c29d6ea58f22b328de7.tar.xz dexon-solidity-74e6067347eb822c2e107c29d6ea58f22b328de7.tar.zst dexon-solidity-74e6067347eb822c2e107c29d6ea58f22b328de7.zip | |
Merge pull request #4602 from hackaugusto/warnings
Added guards for unknown pragmas
Diffstat (limited to 'libevmasm/KnownState.h')
| -rw-r--r-- | libevmasm/KnownState.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libevmasm/KnownState.h b/libevmasm/KnownState.h index 8568b163..cd50550e 100644 --- a/libevmasm/KnownState.h +++ b/libevmasm/KnownState.h @@ -29,12 +29,18 @@ #include <tuple> #include <memory> #include <ostream> -#pragma warning(push) -#pragma GCC diagnostic push + +#if defined(__clang__) +#pragma clang diagnostic push #pragma clang diagnostic ignored "-Wredeclared-class-member" +#endif // defined(__clang__) + #include <boost/bimap.hpp> -#pragma warning(pop) -#pragma GCC diagnostic pop + +#if defined(__clang__) +#pragma clang diagnostic pop +#endif // defined(__clang__) + #include <libdevcore/CommonIO.h> #include <libdevcore/Exceptions.h> #include <libevmasm/ExpressionClasses.h> |