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 00:49:57 +0000 (09:49 +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/cp/cp-tree.h
gcc/testsuite/ChangeLog
gcc/testsuite/g++.dg/lookup/ns4.C
libjava/ChangeLog

index 6e048ca..c044294 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 1350619..f71317b 100644 (file)
@@ -4644,6 +4644,7 @@ extern tree pushdecl_top_level_and_finish (tree, tree);
 extern tree check_for_out_of_scope_variable    (tree);
 extern void print_other_binding_stack          (struct cp_binding_level *);
 extern tree maybe_push_decl                    (tree);
+extern tree current_decl_namespace             (void);
 
 /* decl.c */
 extern tree poplevel                           (int, int, int);
index 3df0787..4156ad4 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.