diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-08-24 07:27:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-24 07:27:09 +0800 |
| commit | 957f23a9f4cb181b2dfaf0170816080513bfe786 (patch) | |
| tree | c1d6de873c54380018f6a88d2fe687b5770c6db7 /solc/jsonCompiler.cpp | |
| parent | ee8fa886cc0fa39ae9c41e9685a576166362906c (diff) | |
| parent | cf5e1d6120513c757bd5c71f1e3af972a9a63aeb (diff) | |
| download | dexon-solidity-957f23a9f4cb181b2dfaf0170816080513bfe786.tar dexon-solidity-957f23a9f4cb181b2dfaf0170816080513bfe786.tar.gz dexon-solidity-957f23a9f4cb181b2dfaf0170816080513bfe786.tar.bz2 dexon-solidity-957f23a9f4cb181b2dfaf0170816080513bfe786.tar.lz dexon-solidity-957f23a9f4cb181b2dfaf0170816080513bfe786.tar.xz dexon-solidity-957f23a9f4cb181b2dfaf0170816080513bfe786.tar.zst dexon-solidity-957f23a9f4cb181b2dfaf0170816080513bfe786.zip | |
Merge pull request #2538 from ethereum/z3Conditions
z3 conditions
Diffstat (limited to 'solc/jsonCompiler.cpp')
| -rw-r--r-- | solc/jsonCompiler.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp index ab928ac0..684d49e4 100644 --- a/solc/jsonCompiler.cpp +++ b/solc/jsonCompiler.cpp @@ -41,9 +41,9 @@ typedef void (*CStyleReadFileCallback)(char const* _path, char** o_contents, cha namespace { -ReadFile::Callback wrapReadCallback(CStyleReadFileCallback _readCallback = nullptr) +ReadCallback::Callback wrapReadCallback(CStyleReadFileCallback _readCallback = nullptr) { - ReadFile::Callback readCallback; + ReadCallback::Callback readCallback; if (_readCallback) { readCallback = [=](string const& _path) @@ -51,23 +51,23 @@ ReadFile::Callback wrapReadCallback(CStyleReadFileCallback _readCallback = nullp char* contents_c = nullptr; char* error_c = nullptr; _readCallback(_path.c_str(), &contents_c, &error_c); - ReadFile::Result result; + ReadCallback::Result result; result.success = true; if (!contents_c && !error_c) { result.success = false; - result.contentsOrErrorMessage = "File not found."; + result.responseOrErrorMessage = "File not found."; } if (contents_c) { result.success = true; - result.contentsOrErrorMessage = string(contents_c); + result.responseOrErrorMessage = string(contents_c); free(contents_c); } if (error_c) { result.success = false; - result.contentsOrErrorMessage = string(error_c); + result.responseOrErrorMessage = string(error_c); free(error_c); } return result; |