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 | 26f554d0d857bfda3f0b6970461c442a5da56dc7 (patch) | |
| tree | a61b503025b25450bf5b4702eafd56ed00d56b8a /CompilerStack.cpp | |
| parent | d25d98a260125cd77807bde72b264bbec21c53c5 (diff) | |
| parent | 407f11ba7689cdd6ea856dc857a07f761255e80d (diff) | |
| download | dexon-solidity-26f554d0d857bfda3f0b6970461c442a5da56dc7.tar dexon-solidity-26f554d0d857bfda3f0b6970461c442a5da56dc7.tar.gz dexon-solidity-26f554d0d857bfda3f0b6970461c442a5da56dc7.tar.bz2 dexon-solidity-26f554d0d857bfda3f0b6970461c442a5da56dc7.tar.lz dexon-solidity-26f554d0d857bfda3f0b6970461c442a5da56dc7.tar.xz dexon-solidity-26f554d0d857bfda3f0b6970461c442a5da56dc7.tar.zst dexon-solidity-26f554d0d857bfda3f0b6970461c442a5da56dc7.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 'CompilerStack.cpp')
| -rw-r--r-- | CompilerStack.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CompilerStack.cpp b/CompilerStack.cpp index 20b0b3e5..d0b1df18 100644 --- a/CompilerStack.cpp +++ b/CompilerStack.cpp @@ -131,7 +131,7 @@ string const& CompilerStack::getInterface(std::string const& _contractName) return getJsonDocumentation(_contractName, ABI_INTERFACE); } -std::string const& CompilerStack::getJsonDocumentation(std::string const& _contractName, enum DocumentationType _type) +std::string const& CompilerStack::getJsonDocumentation(std::string const& _contractName, DocumentationType _type) { if (!m_parseSuccessful) BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("Parsing was not successful.")); @@ -141,13 +141,13 @@ std::string const& CompilerStack::getJsonDocumentation(std::string const& _contr std::unique_ptr<string>* doc; switch (_type) { - case NATSPEC_USER: + case DocumentationType::NATSPEC_USER: doc = &contract.userDocumentation; break; - case NATSPEC_DEV: + case DocumentationType::NATSPEC_DEV: doc = &contract.devDocumentation; break; - case ABI_INTERFACE: + case DocumentationType::ABI_INTERFACE: doc = &contract.interface; break; default: |