diff options
| author | chriseth <chris@ethereum.org> | 2017-08-25 02:50:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-25 02:50:37 +0800 |
| commit | d7661dd97460250b4e1127b9e7ea91e116143780 (patch) | |
| tree | 0d909e7aeec373b0559b9d80f8ae9a9e03bdd92b /libsolidity/interface/StandardCompiler.h | |
| parent | bbb8e64fbee632d1594f6c132b1174591b961207 (diff) | |
| parent | dd67e5966f41be0b2ef52041ea726930af74f7e9 (diff) | |
| download | dexon-solidity-d7661dd97460250b4e1127b9e7ea91e116143780.tar dexon-solidity-d7661dd97460250b4e1127b9e7ea91e116143780.tar.gz dexon-solidity-d7661dd97460250b4e1127b9e7ea91e116143780.tar.bz2 dexon-solidity-d7661dd97460250b4e1127b9e7ea91e116143780.tar.lz dexon-solidity-d7661dd97460250b4e1127b9e7ea91e116143780.tar.xz dexon-solidity-d7661dd97460250b4e1127b9e7ea91e116143780.tar.zst dexon-solidity-d7661dd97460250b4e1127b9e7ea91e116143780.zip | |
Merge pull request #2802 from ethereum/develop
Merge develop into release for 0.4.16
Diffstat (limited to 'libsolidity/interface/StandardCompiler.h')
| -rw-r--r-- | libsolidity/interface/StandardCompiler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libsolidity/interface/StandardCompiler.h b/libsolidity/interface/StandardCompiler.h index dfaf88cd..11a0b4c2 100644 --- a/libsolidity/interface/StandardCompiler.h +++ b/libsolidity/interface/StandardCompiler.h @@ -40,7 +40,7 @@ public: /// Creates a new StandardCompiler. /// @param _readFile callback to used to read files for import statements. Must return /// and must not emit exceptions. - StandardCompiler(ReadFile::Callback const& _readFile = ReadFile::Callback()) + explicit StandardCompiler(ReadCallback::Callback const& _readFile = ReadCallback::Callback()) : m_compilerStack(_readFile), m_readFile(_readFile) { } @@ -56,7 +56,7 @@ private: Json::Value compileInternal(Json::Value const& _input); CompilerStack m_compilerStack; - ReadFile::Callback m_readFile; + ReadCallback::Callback m_readFile; }; } |