[mcs] Fixes name collision check for generic types within user namespaces. Fixes...

diff --git a/mcs/errors/CS0101-9-2.cs b/mcs/errors/CS0101-9-2.cs
new file mode 100644 (file)
index 0000000..8b42750
--- /dev/null
+++ b/mcs/errors/CS0101-9-2.cs
@@ -0,0 +1,4 @@
+namespace N
+{
+       class Test<T> {}
+}
\ No newline at end of file

diff --git a/mcs/errors/cs0101-9.cs b/mcs/errors/cs0101-9.cs
new file mode 100644 (file)
index 0000000..9ae3a3a
--- /dev/null
+++ b/mcs/errors/cs0101-9.cs
@@ -0,0 +1,8 @@
+// CS0101: The namespace `N' already contains a definition for `Test<T>'
+// Line: 7
+// Compiler options: CS0101-9-2.cs
+
+namespace N
+{
+       class Test<T> {}
+}
\ No newline at end of file

diff --git a/mcs/mcs/namespace.cs b/mcs/mcs/namespace.cs
index bed7f9e5e7164b027a3101870220ffc2ee03859a..541466770e7e2bc8f1e00f6831f7177614354137 100644 (file)
--- a/mcs/mcs/namespace.cs
+++ b/mcs/mcs/namespace.cs
@@ -841,7 +841,7 @@ namespace Mono.CSharp {
                                        //
                                        // Same name conflict in different namespace containers
                                        //
-                                       var conflict = ns.GetAllTypes (name);
+                                       var conflict = ns.GetAllTypes (mn.Name);
                                        if (conflict != null) {
                                                foreach (var e in conflict) {
                                                        if (e.Arity == mn.Arity) {