diff options
| author | chriseth <chris@ethereum.org> | 2017-02-01 01:29:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-01 01:29:51 +0800 |
| commit | 364da425d3116a4b85863df39a1864340861d71e (patch) | |
| tree | 521a52c3f8182cd6a054f148bd649c8b6b0e2af9 /libsolidity/ast/ASTJsonConverter.cpp | |
| parent | 60cc1668517f56ce6ca8225555472e7a27eab8b0 (diff) | |
| parent | 7b18c9df1dfa0076566bfa1e4a3bc5e5ba9c8594 (diff) | |
| download | dexon-solidity-364da425d3116a4b85863df39a1864340861d71e.tar dexon-solidity-364da425d3116a4b85863df39a1864340861d71e.tar.gz dexon-solidity-364da425d3116a4b85863df39a1864340861d71e.tar.bz2 dexon-solidity-364da425d3116a4b85863df39a1864340861d71e.tar.lz dexon-solidity-364da425d3116a4b85863df39a1864340861d71e.tar.xz dexon-solidity-364da425d3116a4b85863df39a1864340861d71e.tar.zst dexon-solidity-364da425d3116a4b85863df39a1864340861d71e.zip | |
Merge pull request #1622 from ethereum/develop
Solidity version 0.4.9
Diffstat (limited to 'libsolidity/ast/ASTJsonConverter.cpp')
| -rw-r--r-- | libsolidity/ast/ASTJsonConverter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp index abaad0fd..69c10c8d 100644 --- a/libsolidity/ast/ASTJsonConverter.cpp +++ b/libsolidity/ast/ASTJsonConverter.cpp @@ -42,7 +42,7 @@ void ASTJsonConverter::addJsonNode( { Json::Value node; - node["id"] = reinterpret_cast<Json::UInt64>(&_node); + node["id"] = Json::UInt64(_node.id()); node["src"] = sourceLocationToString(_node.location()); node["name"] = _nodeName; if (_attributes.size() != 0) @@ -124,7 +124,7 @@ bool ASTJsonConverter::visit(ContractDefinition const& _node) { Json::Value linearizedBaseContracts(Json::arrayValue); for (auto const& baseContract: _node.annotation().linearizedBaseContracts) - linearizedBaseContracts.append(reinterpret_cast<Json::UInt64>(baseContract)); + linearizedBaseContracts.append(Json::UInt64(baseContract->id())); addJsonNode(_node, "ContractDefinition", { make_pair("name", _node.name()), make_pair("isLibrary", _node.isLibrary()), |