diff options
| author | Christian <c@ethdev.com> | 2014-10-29 00:01:04 +0800 |
|---|---|---|
| committer | Christian <c@ethdev.com> | 2014-10-29 00:01:04 +0800 |
| commit | 2541a403c31ea59738c8f6f1ac0779ace287c77f (patch) | |
| tree | c5da64ea10ffab15d11c3fd62e29996e597a226a /Types.cpp | |
| parent | 7bb3311be6ba971d05482114df323f1d015e96a9 (diff) | |
| parent | 95c973cc12e3bf6e2bf1094440af46180e8b29d1 (diff) | |
| download | dexon-solidity-2541a403c31ea59738c8f6f1ac0779ace287c77f.tar.gz dexon-solidity-2541a403c31ea59738c8f6f1ac0779ace287c77f.tar.zst dexon-solidity-2541a403c31ea59738c8f6f1ac0779ace287c77f.zip | |
Merge remote-tracking branch 'ethereum/develop' into sol_expressionCompiler
Conflicts:
libsolidity/Types.cpp
Diffstat (limited to 'Types.cpp')
| -rw-r--r-- | Types.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -53,6 +53,7 @@ std::shared_ptr<Type> Type::fromElementaryTypeName(Token::Value _typeToken) return std::make_shared<BoolType>(); else assert(false); // @todo add other tyes + return std::shared_ptr<Type>(); } std::shared_ptr<Type> Type::fromUserDefinedTypeName(UserDefinedTypeName const& _typeName) |