diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-10-09 13:24:50 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-09 13:24:50 +0800 |
| commit | 15e4a5fc300741e5ee74717dd473aafb59bf0308 (patch) | |
| tree | 154c250ea0cca7b86af3f69ff9574003d2d1ab10 | |
| parent | 4ab2e03be3e5550a68a2fcf1608cdcb942dd8957 (diff) | |
| parent | 0712da64212d6b7fa62359aded4f9bbe1a069188 (diff) | |
| download | dexon-solidity-15e4a5fc300741e5ee74717dd473aafb59bf0308.tar dexon-solidity-15e4a5fc300741e5ee74717dd473aafb59bf0308.tar.gz dexon-solidity-15e4a5fc300741e5ee74717dd473aafb59bf0308.tar.bz2 dexon-solidity-15e4a5fc300741e5ee74717dd473aafb59bf0308.tar.lz dexon-solidity-15e4a5fc300741e5ee74717dd473aafb59bf0308.tar.xz dexon-solidity-15e4a5fc300741e5ee74717dd473aafb59bf0308.tar.zst dexon-solidity-15e4a5fc300741e5ee74717dd473aafb59bf0308.zip | |
Merge pull request #5170 from ethereum/minorFixes
Minor fixes
| -rw-r--r-- | docs/control-structures.rst | 2 | ||||
| -rw-r--r-- | docs/frequently-asked-questions.rst | 2 | ||||
| -rw-r--r-- | docs/solidity-by-example.rst | 2 | ||||
| -rw-r--r-- | libsolidity/analysis/SyntaxChecker.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docs/control-structures.rst b/docs/control-structures.rst index 80311a63..353bb61d 100644 --- a/docs/control-structures.rst +++ b/docs/control-structures.rst @@ -279,7 +279,7 @@ groupings of expressions. :: - pragma solidity >0.4.23 <0.5.0; + pragma solidity >0.4.23 <0.6.0; contract C { uint[] data; diff --git a/docs/frequently-asked-questions.rst b/docs/frequently-asked-questions.rst index a474f905..0f8b34f8 100644 --- a/docs/frequently-asked-questions.rst +++ b/docs/frequently-asked-questions.rst @@ -173,7 +173,7 @@ situation. If you do not want to throw, you can return a pair:: - pragma solidity >0.4.23 <0.5.0; + pragma solidity >0.4.23 <0.6.0; contract C { uint[] counters; diff --git a/docs/solidity-by-example.rst b/docs/solidity-by-example.rst index 1bbd42f8..8f58f339 100644 --- a/docs/solidity-by-example.rst +++ b/docs/solidity-by-example.rst @@ -389,7 +389,7 @@ high or low invalid bids. :: - pragma solidity >0.4.23 <0.5.0; + pragma solidity >0.4.23 <0.6.0; contract BlindAuction { struct Bid { diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp index 0bc20f2e..d40a00d4 100644 --- a/libsolidity/analysis/SyntaxChecker.cpp +++ b/libsolidity/analysis/SyntaxChecker.cpp @@ -53,7 +53,7 @@ void SyntaxChecker::endVisit(SourceUnit const& _sourceUnit) SemVerVersion recommendedVersion{string(VersionString)}; if (!recommendedVersion.isPrerelease()) errorString += - "Consider adding \"pragma solidity ^" + + " Consider adding \"pragma solidity ^" + to_string(recommendedVersion.major()) + string(".") + to_string(recommendedVersion.minor()) + |