aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely.gcc@gmail.com>2010-05-14 05:32:48 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2010-05-14 06:32:48 +0100
commita940d033a1e883ca4e20f4a66b07e0b8cccf11f5 (patch)
tree2b1622e43e1ccac7ff2a1884a4334633138c8bb7
parent74b80262bc639e23b4a94175b1ce1926dfa3477b (diff)
downloadgcc-a940d033a1e883ca4e20f4a66b07e0b8cccf11f5.zip
gcc-a940d033a1e883ca4e20f4a66b07e0b8cccf11f5.tar.gz
gcc-a940d033a1e883ca4e20f4a66b07e0b8cccf11f5.tar.bz2
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
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/call.c4
-rw-r--r--gcc/cp/typeck2.c2
3 files changed, 8 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d21c713..291881c 100644
--- 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 6ed53dc..c063992 100644
--- 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 d61ec0a..4a92b7c 100644
--- 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;
}