Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler

Conflicts:
	libsolidity/Types.cpp

1 files changed, 1 insertions, 0 deletions

diff --git a/Types.cpp b/Types.cpp
index cf901e64..05b12df0 100644
--- a/Types.cpp
+++ b/Types.cpp
@@ -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)