mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-31 15:31:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR c++/13262 ("xxx is private within this context" when initializing a *self-contained* template class)

Browse Source 
PR c++/13262
	* pt.c (instantiate_decl): Wrap push_nested_class and
	pop_nested_class around cp_finish_decl call for static member
	variable.

	* g++.dg/template/access13.C: New test.

From-SVN: r74780
This commit is contained in:
Kriang Lerdsuwanakij 2003-12-18 14:14:48 +00:00 committed by Kriang Lerdsuwanakij
parent cebf212fa5
commit bc5ada8472
4 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/cp/ChangeLog
View File

@ -1,3 +1,10 @@
2003-12-18 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
PR c++/13262
* pt.c (instantiate_decl): Wrap push_nested_class and
pop_nested_class around cp_finish_decl call for static member
variable.
2003-12-18 Giovanni Bajo <giovannibajo@gcc.gnu.org>
PR c++/9154

10
gcc/cp/pt.c
View File

@ -11115,10 +11115,20 @@ instantiate_decl (tree d, int defer_ok)
/* Mark D as instantiated so that recursive calls to
instantiate_decl do not try to instantiate it again. */
DECL_TEMPLATE_INSTANTIATED (d) = 1;
/* This is done in analogous to `start_decl'. It is
required for correct access checking. */
push_nested_class (DECL_CONTEXT (d));
cp_finish_decl (d,
(!DECL_INITIALIZED_IN_CLASS_P (d)
? DECL_INITIAL (d) : NULL_TREE),
NULL_TREE, 0);
/* Normally, pop_nested_class is called by cp_finish_decl
above. But when instantiate_decl is triggered during
instantiate_class_template processing, its DECL_CONTEXT
is still not completed yet, and pop_nested_class isn't
called. */
if (!COMPLETE_TYPE_P (DECL_CONTEXT (d)))
pop_nested_class ();
}
}
else if (TREE_CODE (d) == FUNCTION_DECL)

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2003-12-18 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
PR c++/13262
* g++.dg/template/access13.C: New test.
2003-12-18 Ulrich Weigand <uweigand@de.ibm.com>
* gcc.dg/20031216-1.c: New test.

16
gcc/testsuite/g++.dg/template/access13.C Normal file
View File

@ -0,0 +1,16 @@
// { dg-do compile }
// Origin: Francesco Monica <fmonica@ce.unipr.it>
// PR c++/13262: Access checking during instantiation of static data
// member.
template <typename T> class Aclass {
private:
Aclass() {}
static Aclass instance;
};
template <typename T> Aclass<T> Aclass<T>::instance;
template class Aclass<int>;