aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-01-18 22:41:39 +0800
committerGitHub <noreply@github.com>2017-01-18 22:41:39 +0800
commit28a05e5aa3d17f408f29f16647bf46a616781c7b (patch)
treeb050c33dc027772dad17143c2d5baaa159b75390 /libsolidity
parent005e1908854fe26611a175640fad87b430609d16 (diff)
parentc16e141ffbca70174c0efa119dbe7c7ef14b5286 (diff)
downloaddexon-solidity-28a05e5aa3d17f408f29f16647bf46a616781c7b.tar.gz
dexon-solidity-28a05e5aa3d17f408f29f16647bf46a616781c7b.tar.zst
dexon-solidity-28a05e5aa3d17f408f29f16647bf46a616781c7b.zip
Merge pull request #1581 from ethereum/fixosx
Fix JSON output on macos.
Diffstat (limited to 'libsolidity')
-rw-r--r--libsolidity/ast/ASTJsonConverter.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp
index de8fde92..69c10c8d 100644
--- a/libsolidity/ast/ASTJsonConverter.cpp
+++ b/libsolidity/ast/ASTJsonConverter.cpp
@@ -42,7 +42,7 @@ void ASTJsonConverter::addJsonNode(
{
Json::Value node;
- node["id"] = _node.id();
+ 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(baseContract->id());
+ linearizedBaseContracts.append(Json::UInt64(baseContract->id()));
addJsonNode(_node, "ContractDefinition", {
make_pair("name", _node.name()),
make_pair("isLibrary", _node.isLibrary()),