OSDN Git Service

* name-lookup.c (current_decl_namespace): Non-static.
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 7 Apr 2010 15:55:02 +0000 (15:55 +0000)
committerMasaki Muranaka <monaka@monami-software.com>
Sun, 23 May 2010 05:17:31 +0000 (14:17 +0900)
(pop_nested_namespace): Sanity check.
* cp-tree.h: Declare current_decl_namespace.
* decl.c (grokvardecl): Use it instead of current_namespace.
(grokfndecl): Likewise.
* gnu/gcj/runtime/natSharedLibLoader.cc (findCore): Move
declaration of _Jv_create_core out of the function.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158074 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/cp/ChangeLog
gcc/testsuite/ChangeLog
gcc/testsuite/g++.dg/lookup/ns4.C
libjava/ChangeLog

index 36ac899..c5b8e76 100644 (file)
@@ -1,5 +1,11 @@
 2010-04-07  Jason Merrill  <jason@redhat.com>
 
+       * name-lookup.c (current_decl_namespace): Non-static.
+       (pop_nested_namespace): Sanity check.
+       * cp-tree.h: Declare current_decl_namespace.
+       * decl.c (grokvardecl): Use it instead of current_namespace.
+       (grokfndecl): Likewise.
+
        PR c++/38392
        * pt.c (tsubst_friend_function): Instatiate a friend that has already
        been used.
index 1b88654..8434746 100644 (file)
@@ -1,5 +1,7 @@
 2010-04-07  Jason Merrill  <jason@redhat.com>
 
+       * g++.dg/lookup/ns4.C: New.
+
        PR c++/38392
        * g++.dg/template/friend51.C: New test.
 
index aabfcfc..a28cda6 100644 (file)
@@ -1,4 +1,3 @@
-// PR c++/43145
 // { dg-do link }
 
 namespace N {
index 8bc03cc..0a46cf5 100644 (file)
@@ -1,3 +1,8 @@
+2010-04-07  Jason Merrill  <jason@redhat.com>
+
+       * gnu/gcj/runtime/natSharedLibLoader.cc (findCore): Move
+       declaration of _Jv_create_core out of the function.
+
 2010-04-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * Makefile.in: Regenerate.