diff options
| author | Christian <c@ethdev.com> | 2014-12-08 19:07:17 +0800 |
|---|---|---|
| committer | Christian <c@ethdev.com> | 2014-12-08 19:07:17 +0800 |
| commit | 3bc5e142dd3626426ff17e91494b68a431a6c74c (patch) | |
| tree | 38f5a7239e233cb0819aafbd393277d3f3b1103d /solidityNatspecJSON.cpp | |
| parent | 863539959717a89690cb51b1a0d5df69c8c7605f (diff) | |
| parent | fe790a3221dee0faefa9c303002a45875e08765a (diff) | |
| download | dexon-solidity-3bc5e142dd3626426ff17e91494b68a431a6c74c.tar.gz dexon-solidity-3bc5e142dd3626426ff17e91494b68a431a6c74c.tar.zst dexon-solidity-3bc5e142dd3626426ff17e91494b68a431a6c74c.zip | |
Merge remote-tracking branch 'ethereum/develop' into sol_import
Conflicts:
libsolidity/CompilerStack.cpp
libsolidity/CompilerStack.h
libsolidity/InterfaceHandler.cpp
libsolidity/InterfaceHandler.h
solc/main.cpp
test/solidityJSONInterfaceTest.cpp
test/solidityNatspecJSON.cpp
Diffstat (limited to 'solidityNatspecJSON.cpp')
| -rw-r--r-- | solidityNatspecJSON.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solidityNatspecJSON.cpp b/solidityNatspecJSON.cpp index c5b9e151..f1795fe1 100644 --- a/solidityNatspecJSON.cpp +++ b/solidityNatspecJSON.cpp @@ -55,9 +55,9 @@ public: } if (_userDocumentation) - generatedDocumentationString = m_compilerStack.getJsonDocumentation("", NATSPEC_USER); + generatedDocumentationString = m_compilerStack.getJsonDocumentation("", DocumentationType::NATSPEC_USER); else - generatedDocumentationString = m_compilerStack.getJsonDocumentation("", NATSPEC_DEV); + generatedDocumentationString = m_compilerStack.getJsonDocumentation("", DocumentationType::NATSPEC_DEV); Json::Value generatedDocumentation; m_reader.parse(generatedDocumentationString, generatedDocumentation); Json::Value expectedDocumentation; |