diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2d82433628b..0e7d5e935ba 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-04  Richard Guenther  <rguenther@suse.de>
+
+	PR c++/22487
+	* init.c (build_vec_init): Build comparison of matching
+	types.
+
 2005-11-03  Josh Conner  <jconner@apple.com>
 
 	PR c++/19989
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 44cfc440628..1ff2fd7be7b 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -2613,8 +2613,8 @@ build_vec_init (tree base, tree maxindex, tree init,
 
       for_stmt = begin_for_stmt ();
       finish_for_init_stmt (for_stmt);
-      finish_for_cond (build2 (NE_EXPR, boolean_type_node,
-			       iterator, integer_minus_one_node),
+      finish_for_cond (build2 (NE_EXPR, boolean_type_node, iterator,
+			       build_int_cst (TREE_TYPE (iterator), -1)),
 		       for_stmt);
       finish_for_expr (build_unary_op (PREDECREMENT_EXPR, iterator, 0),
 		       for_stmt);