diff options
| author | chriseth <chris@ethereum.org> | 2017-05-27 01:30:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-27 01:30:42 +0800 |
| commit | 788b64ea6181af6e7e364e86d64508c4809ca9b7 (patch) | |
| tree | 2a136a342d6f8980f96043b0f6ce74828f89fdd6 /libsolidity/inlineasm/AsmAnalysis.h | |
| parent | e022f11cdb752a07b6c0f824f3e4f91233a19359 (diff) | |
| parent | fe32531a16322c9528c34cfbd32924b4c24a1f13 (diff) | |
| download | dexon-solidity-788b64ea6181af6e7e364e86d64508c4809ca9b7.tar dexon-solidity-788b64ea6181af6e7e364e86d64508c4809ca9b7.tar.gz dexon-solidity-788b64ea6181af6e7e364e86d64508c4809ca9b7.tar.bz2 dexon-solidity-788b64ea6181af6e7e364e86d64508c4809ca9b7.tar.lz dexon-solidity-788b64ea6181af6e7e364e86d64508c4809ca9b7.tar.xz dexon-solidity-788b64ea6181af6e7e364e86d64508c4809ca9b7.tar.zst dexon-solidity-788b64ea6181af6e7e364e86d64508c4809ca9b7.zip | |
Merge pull request #2291 from ethereum/evm15
Allow different assembly types and target machines.
Diffstat (limited to 'libsolidity/inlineasm/AsmAnalysis.h')
| -rw-r--r-- | libsolidity/inlineasm/AsmAnalysis.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libsolidity/inlineasm/AsmAnalysis.h b/libsolidity/inlineasm/AsmAnalysis.h index 9f022b12..613abf38 100644 --- a/libsolidity/inlineasm/AsmAnalysis.h +++ b/libsolidity/inlineasm/AsmAnalysis.h @@ -64,7 +64,7 @@ public: AsmAnalyzer( AsmAnalysisInfo& _analysisInfo, ErrorList& _errors, - ExternalIdentifierAccess::Resolver const& _resolver = ExternalIdentifierAccess::Resolver() + julia::ExternalIdentifierAccess::Resolver const& _resolver = julia::ExternalIdentifierAccess::Resolver() ); bool analyze(assembly::Block const& _block); @@ -94,7 +94,7 @@ private: /// we enter the block. int m_virtualVariablesInNextBlock = 0; int m_stackHeight = 0; - ExternalIdentifierAccess::Resolver const& m_resolver; + julia::ExternalIdentifierAccess::Resolver const& m_resolver; Scope* m_currentScope = nullptr; AsmAnalysisInfo& m_info; ErrorList& m_errors; |