diff options
| author | Augusto F. Hack <hack.augusto@gmail.com> | 2018-07-22 06:08:47 +0800 |
|---|---|---|
| committer | Augusto F. Hack <hack.augusto@gmail.com> | 2018-08-06 06:21:33 +0800 |
| commit | 6c3b48ddfcfb0849e1083cea8d4fae4446511be1 (patch) | |
| tree | 026b6acf54761cec4cc5573c9e3147e6270f1f63 /libevmasm | |
| parent | 20c65f9af1f42620db7b77543717a2b341771daf (diff) | |
| download | dexon-solidity-6c3b48ddfcfb0849e1083cea8d4fae4446511be1.tar.gz dexon-solidity-6c3b48ddfcfb0849e1083cea8d4fae4446511be1.tar.zst dexon-solidity-6c3b48ddfcfb0849e1083cea8d4fae4446511be1.zip | |
Added guards for unknown pragmas
Removed push/pop if there was no change to the warnings *in the same
file* for a given compiler. This assumes the imported boost headers use
a warning stack themselves.
The pragmas don't seem to be required anymore, but were not removed to
mantain compatibility with older versions of the boost library.
Compiled with
- clang version 6.0.1 (tags/RELEASE_601/final)
- gcc (GCC) 8.1.1 20180531
against:
- libboost 1.67.0-5
Diffstat (limited to 'libevmasm')
| -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> |