diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-02 07:54:07 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-02 07:54:07 +0000 |
| commit | 8ab7ada7e20e6dfd07336b6304216ab5aa58a76a (patch) | |
| tree | aebc63f729cc9472233ec6e6441f5019915f64ac /gcc/cp/class.c | |
| parent | 666ebe7fced2506b14b95511c8b2630d85aebe2c (diff) | |
| download | gcc-8ab7ada7e20e6dfd07336b6304216ab5aa58a76a.tar.gz | |
2012-05-02 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 187035 using svnmerge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@187037 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/class.c')
| -rw-r--r-- | gcc/cp/class.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 7b6559c4231..00aeefd5d48 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -1,6 +1,7 @@ /* Functions related to building classes and their related objects. Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011 + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, + 2012 Free Software Foundation, Inc. Contributed by Michael Tiemann (tiemann@cygnus.com) @@ -5144,9 +5145,6 @@ check_bases_and_members (tree t) give the synthesis error. */ error ("%q+D declared to take const reference, but implicit " "declaration would take non-const", fn); - else if (imp_const_p && !fn_const_p) - error ("%q+D declared to take non-const reference cannot be " - "defaulted in the class body", fn); } defaulted_late_check (fn); } |