diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/class.c | 14 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/pr36944.C | 26 |
4 files changed, 46 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c40808e..6a13613 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2008-07-27 H.J. Lu <hongjiu.lu@intel.com> + + PR c++/36944 + * class.c (type_has_user_provided_default_constructor): Handle + default parameters. + 2008-07-27 Paolo Carlini <paolo.carlini@oracle.com> * decl.c (push_library_fn): Add a parameter for the exceptions that diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 1820460..f7e46a7 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -4107,7 +4107,7 @@ type_has_user_provided_constructor (tree t) bool type_has_user_provided_default_constructor (tree t) { - tree fns; + tree fns, args; if (!TYPE_HAS_USER_CONSTRUCTOR (t)) return false; @@ -4116,10 +4116,14 @@ type_has_user_provided_default_constructor (tree t) { tree fn = OVL_CURRENT (fns); if (TREE_CODE (fn) == FUNCTION_DECL - && user_provided_p (fn) - && (skip_artificial_parms_for (fn, DECL_ARGUMENTS (fn)) - == NULL_TREE)) - return true; + && user_provided_p (fn)) + { + args = FUNCTION_FIRST_USER_PARMTYPE (fn); + while (args && TREE_PURPOSE (args)) + args = TREE_CHAIN (args); + if (!args || args == void_list_node) + return true; + } } return false; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 95b0cde..c32bc3d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-07-27 H.J. Lu <hongjiu.lu@intel.com> + + PR c++/36944 + * g++.dg/other/pr36944.C: New. + 2008-07-27 Daniel Franke <franke.daniel@gmail.com> PR fortran/36724 diff --git a/gcc/testsuite/g++.dg/other/pr36944.C b/gcc/testsuite/g++.dg/other/pr36944.C new file mode 100644 index 0000000..b4a1dfa --- /dev/null +++ b/gcc/testsuite/g++.dg/other/pr36944.C @@ -0,0 +1,26 @@ +/* { dg-do compile } */ + +class XObject +{ +public: + int foo; +}; + +class XObjectPtr +{ +public: + explicit + XObjectPtr(XObject* theXObject = 0) : m_xobjectPtr(theXObject) + { + } + +private: + XObject * m_xobjectPtr; +}; + +class SelectionEvent +{ +public: + SelectionEvent(bool selection) : m_selection() {} + const XObjectPtr m_selection; +}; |