call.c (build_new_method_call): Change warning text.

2010-05-14  Jonathan Wakely  <jwakely.gcc@gmail.com>

	* call.c (build_new_method_call): Change warning text.
	* typeck2.c (build_functional_cast): Change error text.

From-SVN: r159385

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d21c7137eede07efb4f7c9cfd19bddbfde699070..291881c58b26fbe9c85cac88bfd95be613826ab5 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-14  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+       * call.c (build_new_method_call): Change warning text.
+       * typeck2.c (build_functional_cast): Change error text.
+
 2010-05-14  Shujing Zhao  <pearly.zhao@oracle.com>
 
        PR c++/30566

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 6ed53dcb6749f30431f47eb28faa0bf37683d767..c0639920cf9208dca11eb766d94489b3b060380c 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -6443,8 +6443,8 @@ build_new_method_call (tree instance, tree fns, VEC(tree,gc) **args,
            /* This is not an error, it is runtime undefined
               behavior.  */
            warning (0, (DECL_CONSTRUCTOR_P (current_function_decl) ?
-                     "abstract virtual %q#D called from constructor"
-                     : "abstract virtual %q#D called from destructor"),
+                     "pure virtual %q#D called from constructor"
+                     : "pure virtual %q#D called from destructor"),
                     fn);
 
          if (TREE_CODE (TREE_TYPE (fn)) == METHOD_TYPE

diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index d61ec0a6fad53c2bba4be0bef5f6e7ca7cd683b2..4a92b7c5c810280c8e3e1731fd7648b49e982b9f 100644 (file)
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -1580,7 +1580,7 @@ build_functional_cast (tree exp, tree parms, tsubst_flags_t complain)
 
   if (TREE_CODE (type) == REFERENCE_TYPE && !parms)
     {
-      error ("invalid value-initialization of reference types");
+      error ("invalid value-initialization of reference type");
       return error_mark_node;
     }