Merge pull request #3892 from ethereum/develop

Merge develop into release for 0.4.22

1 files changed, 6 insertions, 0 deletions

diff --git a/test/libsolidity/syntaxTests/scoping/double_function_declaration.sol b/test/libsolidity/syntaxTests/scoping/double_function_declaration.sol
new file mode 100644
index 00000000..dfd67aaa
--- /dev/null
+++ b/test/libsolidity/syntaxTests/scoping/double_function_declaration.sol
@@ -0,0 +1,6 @@
+contract test {
+    function fun() public { }
+    function fun() public { }
+}
+// ----
+// DeclarationError: (20-45): Function with same name and arguments defined twice.