84th Cygnus<->FSF merge

[gcc.git] / gcc / cp / method.c

diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 5156121ffb74534b67b18fb2bf1d68d91f4312ca..6b45ff4008e62a8720651700fc6d9377cb8e1da3 100644 (file)
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -364,7 +364,8 @@ build_overload_int (value)
        OB_PUTC ('_');
       return;
     }
-  else if (uses_template_parms (value))
+  else if (current_template_parms
+          && TREE_CODE (value) != INTEGER_CST)
     /* We don't ever want this output, but it's inconvenient not to
        be able to build the string.  This should cause assembler
        errors we'll notice.  */