aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog7
-rw-r--r--gcc/cp/decl.c1
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 81da122..8776b1f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,12 @@
2005-10-28 Andrew Pinski <pinskia@physics.uc.edu>
+ * decl.c (grokfndecl): Remove the setting
+ of the return type of the function type
+ of main after erroring about must returning
+ int.
+
+2005-10-28 Andrew Pinski <pinskia@physics.uc.edu>
+
PR C++/23229
* decl.c (grokfndecl): Create a new function type
after erroring out about main not returning int.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 07278ff..7e38ec3 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5722,7 +5722,6 @@ grokfndecl (tree ctype,
newtype = build_function_type (integer_type_node,
oldtypeargs);
TREE_TYPE (decl) = newtype;
- TREE_TYPE (TREE_TYPE (decl)) = integer_type_node;
}
inlinep = 0;
publicp = 1;