* decl.c (finish_function): Give a pedwarn for reaching end of

	non-void function, not just a warning.
Remove the above.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@18218 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e10f4d7..757a1fd 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,8 +1,3 @@
-1998-02-24  Brendan Kehoe  <brendan@cygnus.com>
-
-       * decl.c (finish_function): Give a pedwarn for reaching end of
-       non-void function, not just a warning.
-
 Tue Feb 24 01:40:24 1998  Jason Merrill  <jason@yorick.cygnus.com>
 
        * pt.c (instantiate_class_template): Don't instantiate if pedantic

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index f5f3397..df260a3 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -12552,7 +12552,7 @@ finish_function (lineno, call_poplevel, nested)
        {
          /* If this function returns non-void and control can drop through,
             complain.  */
-         cp_pedwarn ("control reaches end of non-void function `%D'", fndecl);
+         cp_warning ("control reaches end of non-void function `%D'", fndecl);
        }
       /* With just -W, complain only if function returns both with
         and without a value.  */