obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 23 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.dg/lookup/template1.C b/gcc/testsuite/g++.dg/lookup/template1.C
new file mode 100644
index 000000000..44b599a6d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/lookup/template1.C
@@ -0,0 +1,23 @@
+/* PR c++/3009 */
+/* { dg-do run } */
+// According to 14.6.2.4 of C++ Standard:
+// "If a base class is a dependent type, a member of that
+// class cannot hide a name declared within a template, or a
+// name from the template's enclosing scopes."
+ 
+class B {
+public:
+  int foo() { return 1; }
+};
+ 
+int foo() { return 0; }
+ 
+template <class T> class C : public T {
+public:
+  int caller() { return foo(); } // This must be ::foo, not B::foo.
+};
+
+int main() {
+  C<B> c;
+  return c.caller(); // Returns 1 if we got the wrong one.
+}