* call.c (joust): Disable warnings until they can be moved to the

	right place.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@15450 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 577596f..11b4885 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 15 11:52:13 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * call.c (joust): Disable warnings until they can be moved to the
+       right place.
+
 Fri Sep 12 16:11:13 1997  Per Bothner  <bothner@cygnus.com>
 
        * Makefile.in, config-lang.in:  Convert to autoconf.

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 5bf18c9..c0152fb 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -5977,6 +5977,7 @@ joust (cand1, cand2)
 
       if (comp != 0)
        {
+#if 0 /* move this warning to tourney.  */
          if (warn_sign_promo
              && ICS_RANK (t1) + ICS_RANK (t2) == STD_RANK + PROMO_RANK
              && TREE_CODE (t1) == STD_CONV
@@ -6000,6 +6001,7 @@ joust (cand1, cand2)
                          type, type1, type2);
              cp_warning ("  in call to `%D'", DECL_NAME (cand1->fn));
            }
+#endif
 
          if (winner && comp != winner)
            {
@@ -6010,6 +6012,7 @@ joust (cand1, cand2)
        }
     }
 
+#if 0 /* move this warning to tourney.  */
   /* warn about confusing overload resolution */
   if (winner && cand1->second_conv
       && ! DECL_CONSTRUCTOR_P (cand1->fn)
@@ -6030,6 +6033,7 @@ joust (cand1, cand2)
          cp_warning ("  because conversion sequence for `this' argument is better");
        }
     }
+#endif
 
   if (winner)
     return winner;