diff options
| author | chriseth <c@ethdev.com> | 2016-03-18 18:47:23 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2016-03-18 18:47:23 +0800 |
| commit | e759a248165b3141495a789fad158eef0cc22ac6 (patch) | |
| tree | 8f6f0fe2546feb23d6b6149525b776c3dca8a5b0 /test | |
| parent | e8bef6fc01dd3f93429110cf1f92817e1a99152c (diff) | |
| parent | a1ce66b304e7187cfae1457de91a031c0931273c (diff) | |
| download | dexon-solidity-e759a248165b3141495a789fad158eef0cc22ac6.tar dexon-solidity-e759a248165b3141495a789fad158eef0cc22ac6.tar.gz dexon-solidity-e759a248165b3141495a789fad158eef0cc22ac6.tar.bz2 dexon-solidity-e759a248165b3141495a789fad158eef0cc22ac6.tar.lz dexon-solidity-e759a248165b3141495a789fad158eef0cc22ac6.tar.xz dexon-solidity-e759a248165b3141495a789fad158eef0cc22ac6.tar.zst dexon-solidity-e759a248165b3141495a789fad158eef0cc22ac6.zip | |
Merge pull request #433 from bobsummerwill/develop
Fixed Windows warnings
Diffstat (limited to 'test')
| -rw-r--r-- | test/contracts/FixedFeeRegistrar.cpp | 9 | ||||
| -rw-r--r-- | test/contracts/Wallet.cpp | 9 | ||||
| -rw-r--r-- | test/libsolidity/SolidityNameAndTypeResolution.cpp | 2 | ||||
| -rw-r--r-- | test/libsolidity/SolidityParser.cpp | 2 |
4 files changed, 20 insertions, 2 deletions
diff --git a/test/contracts/FixedFeeRegistrar.cpp b/test/contracts/FixedFeeRegistrar.cpp index f42f4492..796b3831 100644 --- a/test/contracts/FixedFeeRegistrar.cpp +++ b/test/contracts/FixedFeeRegistrar.cpp @@ -22,7 +22,16 @@ #include <string> #include <tuple> + +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4535) // calling _set_se_translator requires /EHa +#endif #include <boost/test/unit_test.hpp> +#if defined(_MSC_VER) +#pragma warning(pop) +#endif + #include <libdevcore/Hash.h> #include <test/libsolidity/solidityExecutionFramework.h> diff --git a/test/contracts/Wallet.cpp b/test/contracts/Wallet.cpp index 476e817b..7c4a9a84 100644 --- a/test/contracts/Wallet.cpp +++ b/test/contracts/Wallet.cpp @@ -22,7 +22,16 @@ #include <string> #include <tuple> + +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4535) // calling _set_se_translator requires /EHa +#endif #include <boost/test/unit_test.hpp> +#if defined(_MSC_VER) +#pragma warning(pop) +#endif + #include <libdevcore/Hash.h> #include <test/libsolidity/solidityExecutionFramework.h> diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp index bf43224f..3d0cc2cd 100644 --- a/test/libsolidity/SolidityNameAndTypeResolution.cpp +++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp @@ -102,7 +102,7 @@ parseAnalyseAndReturnError(string const& _source, bool _reportWarnings = false) { return make_pair(sourceUnit, std::make_shared<Error::Type const>(_e.type())); } - catch (Exception const& _exception) + catch (Exception const& /*_exception*/) { return make_pair(sourceUnit, nullptr); } diff --git a/test/libsolidity/SolidityParser.cpp b/test/libsolidity/SolidityParser.cpp index 055fae49..2a7e82a7 100644 --- a/test/libsolidity/SolidityParser.cpp +++ b/test/libsolidity/SolidityParser.cpp @@ -60,7 +60,7 @@ bool successParse(std::string const& _source) if (!sourceUnit) return false; } - catch (FatalError const& _exception) + catch (FatalError const& /*_exception*/) { if (Error::containsErrorOfType(errors, Error::Type::ParserError)) return false; |