diff options
| author | Fabien Chêne <fabien.chene@gmail.com> | 2008-11-05 10:48:01 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2008-11-05 10:48:01 -0500 |
| commit | 8df7b2b60e8d304998ae7b487e8981c9cc30040a (patch) | |
| tree | 859e5020d7b4ccd98da9f6b6f9b6f19f65d32191 | |
| parent | f0bf39b4d07be6ae1afa70497922d61c2d67fc9a (diff) | |
| download | gcc-8df7b2b60e8d304998ae7b487e8981c9cc30040a.zip gcc-8df7b2b60e8d304998ae7b487e8981c9cc30040a.tar.gz gcc-8df7b2b60e8d304998ae7b487e8981c9cc30040a.tar.bz2 | |
re PR c++/32519 (g++ allows access to protected template member functions of base class)
PR c++/35219
* cp-tree.h: Fix DECL_NONSTATIC_MEMBER_P to handle member template
functions.
From-SVN: r141612
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3b4f8b1..55a81ec 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2008-11-05 Fabien Chene <fabien.chene@gmail.com> + + PR c++/35219 + * cp-tree.h: Fix DECL_NONSTATIC_MEMBER_P to handle member template + functions. + 2008-11-05 Richard Guenther <rguenther@suse.de> PR middle-end/37742 diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 7ff5824..b79b819 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -1978,8 +1978,7 @@ struct lang_decl GTY(()) /* Nonzero for a DECL means that this member is a non-static member. */ #define DECL_NONSTATIC_MEMBER_P(NODE) \ - ((TREE_CODE (NODE) == FUNCTION_DECL \ - && DECL_NONSTATIC_MEMBER_FUNCTION_P (NODE)) \ + (DECL_NONSTATIC_MEMBER_FUNCTION_P (NODE) \ || TREE_CODE (NODE) == FIELD_DECL) /* Nonzero for _DECL means that this member object type diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 79811bd..1049f5f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-11-05 Fabien Chene <fabien.chene@gmail.com> + + PR c++/32519 + * g++.dg/template/pr32519.C: New test. + 2008-11-05 Richard Guenther <rguenther@suse.de> PR middle-end/37742 |