diff options
| author | chriseth <chris@ethereum.org> | 2017-04-10 20:56:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-10 20:56:00 +0800 |
| commit | 8cbe87b4089bfb19dafd0b700586eaeeda30e271 (patch) | |
| tree | 4fe0a7d7e461844578091fd43575cb34297f53c8 /solc/jsonCompiler.cpp | |
| parent | 9fe206505b3e864ccd8a2f4e288b9a5f31d1ff46 (diff) | |
| parent | 623b8eb107a97861e3e7e0c13acee39c8d5f4075 (diff) | |
| download | dexon-solidity-8cbe87b4089bfb19dafd0b700586eaeeda30e271.tar.gz dexon-solidity-8cbe87b4089bfb19dafd0b700586eaeeda30e271.tar.zst dexon-solidity-8cbe87b4089bfb19dafd0b700586eaeeda30e271.zip | |
Merge pull request #2111 from ethereum/readfile
Pull out ReadFile from CompilerStack
Diffstat (limited to 'solc/jsonCompiler.cpp')
| -rw-r--r-- | solc/jsonCompiler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp index 45322117..74d6a901 100644 --- a/solc/jsonCompiler.cpp +++ b/solc/jsonCompiler.cpp @@ -130,7 +130,7 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback { Json::Value output(Json::objectValue); Json::Value errors(Json::arrayValue); - CompilerStack::ReadFileCallback readCallback; + ReadFile::Callback readCallback; if (_readCallback) { readCallback = [=](string const& _path) @@ -138,7 +138,7 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback char* contents_c = nullptr; char* error_c = nullptr; _readCallback(_path.c_str(), &contents_c, &error_c); - CompilerStack::ReadFileResult result; + ReadFile::Result result; result.success = true; if (!contents_c && !error_c) { |