diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 99a8d4dc2a70..f73c82429c4d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-15  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* decl.c (cp_finish_decl): Remove obsolete comment.
+	
+	* typeck.c (build_ptrmemfunc1): Kill uninitialized warning.
+
 2000-03-14  Mark Mitchell  <mark@codesourcery.com>
 
 	* cp-tree.h: Tweak documentation.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 7bdcca91f8de..fdb35b2175ee 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -7844,12 +7844,7 @@ emit_local_var (decl)
    the normal rules.
 
    FLAGS is LOOKUP_ONLYCONVERTING if the = init syntax was used, else 0
-   if the (init) syntax was used.
-
-   For functions that take default parameters, DECL points to its
-   "maximal" instantiation.  `cp_finish_decl' must then also declared its
-   subsequently lower and lower forms of instantiation, checking for
-   ambiguity as it goes.  This can be sped up later.  */
+   if the (init) syntax was used.  */
 
 void
 cp_finish_decl (decl, init, asmspec_tree, flags)
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index aed8bb308d3a..6e1b66719418 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -6077,7 +6077,7 @@ tree
 build_ptrmemfunc1 (type, delta, idx, pfn, delta2)
      tree type, delta, idx, pfn, delta2;
 {
-  tree u;
+  tree u = NULL_TREE;
   tree delta_field;
   tree idx_field;
   tree pfn_or_delta2_field;