Merge pull request #1581 from ethereum/fixosx

Fix JSON output on macos.
This commit is contained in:
chriseth 2017-01-18 15:41:39 +01:00 committed by GitHub
commit 28a05e5aa3

View File

@ -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()),