summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/cvt.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c8e448f4e2b..ce53aed0212 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-23 Mark Mitchell <mark@codesourcery.com>
+
+ * cvt.c (convert_to_void): Fix typo in comment.
+
2004-12-23 Alexandre Oliva <aoliva@redhat.com>
PR c++/18962
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index 64db10097a2..b68cf0fd5b7 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -925,7 +925,7 @@ convert_to_void (tree expr, const char *implicit)
/* We might like to warn about (say) "(int) f()", as the
cast has no effect, but the compiler itself will
generate implicit conversions under some
- circmstances. (For example a block copy will be
+ circumstances. (For example a block copy will be
turned into a call to "__builtin_memcpy", with a
conversion of the return value to an appropriate
type.) So, to avoid false positives, we strip