2004-02-03 Michael Chastain <mec.gnu@mindspring.com>

	* gdb.cp/inherit.exp: Accept both "ctor()" and "ctor(void)".

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b1cfc23..7c6dee1 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2004-02-03  Michael Chastain  <mec.gnu@mindspring.com>
 
+       * gdb.cp/inherit.exp: Accept both "ctor()" and "ctor(void)".
+
+2004-02-03  Michael Chastain  <mec.gnu@mindspring.com>
+
        * gdb.cp/inherit.exp: Accept output with gcc 3.2-7-rh.
 
 2004-02-02  Fred Fish  <fnf@redhat.com>

diff --git a/gdb/testsuite/gdb.cp/inherit.exp b/gdb/testsuite/gdb.cp/inherit.exp
index 7d866c9..7374c2d 100644 (file)
--- a/gdb/testsuite/gdb.cp/inherit.exp
+++ b/gdb/testsuite/gdb.cp/inherit.exp
@@ -351,7 +351,7 @@ proc test_ptype_vi { } {
     set re_access      "public:"
     set re_fields      "int vb;${ws}int vx;"
     set re_synth_gcc_2 "vB & operator=\\(vB const ?&\\);${ws}vB\\(int, vB const ?&\\);${ws}vB\\(int\\);"
-    set re_synth_gcc_3 "vB & operator=\\(vB const ?&\\);${ws}vB\\(vB const ?&\\);${ws}vB\\(\\);"
+    set re_synth_gcc_3 "vB & operator=\\(vB const ?&\\);${ws}vB\\(vB const ?&\\);${ws}vB\\((void|)\\);"
 
     set name "ptype vB"
     gdb_test_multiple "ptype vB" $name {
@@ -426,7 +426,7 @@ proc test_ptype_vi { } {
     set re_access      "public:"
     set re_fields      "int vc;${ws}int vx;"
     set re_synth_gcc_2 "vC & operator=\\(vC const ?&\\);${ws}vC\\(int, vC const ?&\\);${ws}vC\\(int\\);"
-    set re_synth_gcc_3 "vC & operator=\\(vC const ?&\\);${ws}vC\\(vC const ?&\\);${ws}vC\\(\\);"
+    set re_synth_gcc_3 "vC & operator=\\(vC const ?&\\);${ws}vC\\(vC const ?&\\);${ws}vC\\((void|)\\);"
 
     set name "ptype vC"
     gdb_test_multiple "ptype vC" $name {
@@ -509,7 +509,7 @@ proc test_ptype_mvi { } {
     set re_access      "public:"
     set re_fields      "int vd;${ws}int vx;"
     set re_synth_gcc_2 "vD & operator=\\(vD const ?&\\);${ws}vD\\(int, vD const ?&\\);${ws}vD\\(int\\);"
-    set re_synth_gcc_3 "vD & operator=\\(vD const ?&\\);${ws}vD\\(vD const ?&\\);${ws}vD\\(\\);"
+    set re_synth_gcc_3 "vD & operator=\\(vD const ?&\\);${ws}vD\\(vD const ?&\\);${ws}vD\\((void|)\\);"
 
     set name "ptype vD"
     gdb_test_multiple "ptype vD" $name {
@@ -584,7 +584,7 @@ proc test_ptype_mvi { } {
     set re_access      "public:"
     set re_fields      "int ve;${ws}int vx;"
     set re_synth_gcc_2 "vE & operator=\\(vE const ?&\\);${ws}vE\\(int, vE const ?&\\);${ws}vE\\(int\\);"
-    set re_synth_gcc_3 "vE & operator=\\(vE const ?&\\);${ws}vE\\(vE const ?&\\);${ws}vE\\(\\);"
+    set re_synth_gcc_3 "vE & operator=\\(vE const ?&\\);${ws}vE\\(vE const ?&\\);${ws}vE\\((void|)\\);"
 
     set name "ptype vE"
     gdb_test_multiple "ptype vE" $name {