diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 58a962f4bc3..54b0f476061 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+1999-11-02  Scott Snyder  <snyder@fnal.gov>
+
+        * decl2.c (build_expr_from_tree): Handle REALPART_EXPR and
+        IMAGPART_EXPR.
+	* pt.c (tsubst_copy): Likewise.
+
 1999-11-01  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* decl2.c (maybe_make_one_only): Always make things comdat on
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 6ecd0946b1d..82264e4052f 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -3744,6 +3744,8 @@ build_expr_from_tree (t)
     case TRUTH_NOT_EXPR:
     case ADDR_EXPR:
     case CONVERT_EXPR:      /* Unary + */
+    case REALPART_EXPR:
+    case IMAGPART_EXPR:
       if (TREE_TYPE (t))
 	return t;
       return build_x_unary_op (TREE_CODE (t),
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 4a0d7d12bf7..c96d0320435 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6897,6 +6897,8 @@ tsubst_copy (t, args, complain, in_decl)
     case ARROW_EXPR:
     case THROW_EXPR:
     case TYPEID_EXPR:
+    case REALPART_EXPR:
+    case IMAGPART_EXPR:
       return build1
 	(code, tsubst (TREE_TYPE (t), args, complain, in_decl),
 	 tsubst_copy (TREE_OPERAND (t, 0), args, complain, in_decl));