call.c (struct conversion_info): Rename 'from_type' to 'from'.

	* call.c (struct conversion_info): Rename 'from_type' to 'from'.
	(arg_conversion_rejection, bad_arg_conversion_rejection)
	(explicit_conversion_rejection, template_conversion_rejection): Adjust.
	(add_function_candidate): Pass actual argument, rather than type, to
	bad_arg_conversion_rejection.
	(print_conversion_rejection): Explain what's wrong with the conversion.
	(print_z_candidate): Say "candidate:" before each candidate.
	(splice_viable): Be strict if we see a viable or template candidate.
	(build_user_type_conversion_1): Pass false to strict parameter.
	(perform_overload_resolution, build_conditional_expr_1): Likewise.
	(build_new_op_1, build_new_method_call_1): Likewise.
	(build_op_call_1): Pass true to strict parameter.

From-SVN: r210435

5 files changed, 0 insertions, 6 deletions

diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb109.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb109.C
index b44c33d273c..6dc2c55be58 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb109.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb109.C
@@ -66,7 +66,6 @@ int main()
 {
     // no edge weighting, therefore type Empty:
     Graph<std::string, Empty> V(true);        // { dg-error "no match" } no bool constructor
-    // { dg-message "candidate" "candidate note" { target *-*-* } 68 }
     // ReadGraph(V, "gra1.dat");
 
     // display of vertices with successors
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb119.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb119.C
index 329393aeadf..c4b3ffe6509 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb119.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb119.C
@@ -7,6 +7,5 @@ void f()			// { dg-message "note" }
 int main()
 {
   f<bool>(); // { dg-error "" } .*
-  // { dg-message "candidate" "candidate note" { target *-*-* } 9 }
 }
 
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb131.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb131.C
index 67445308c1a..6a0f1c35c0f 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb131.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb131.C
@@ -16,7 +16,5 @@ struct a {
 a::a()
 {
 	foo( &junk ); // { dg-error "match" } junk is an unqualified-id.
-	// { dg-message "candidate" "candidate note" { target *-*-* } 18 }
 	foo( &bar );  // { dg-error "match" } bar is an unqualified-id.
-	// { dg-message "candidate" "candidate note" { target *-*-* } 20 }
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb22.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb22.C
index a78ea41085a..e9d50deaf63 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb22.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb22.C
@@ -25,5 +25,4 @@ bool f()
 {
   return 3 == MyInt();                          // { dg-error "ambiguous" "err" } 
   // { dg-message "operator==" "match candidate text" { target *-*-* } 26 }
-  // { dg-message "candidates" "note" { target *-*-* } 26 }
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb69.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb69.C
index 1ada9123429..9620b87be44 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb69.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb69.C
@@ -12,7 +12,6 @@ struct foo {		        // { dg-message "note" } candidate
 struct bar : foo {
   typedef int an_int;
   bar() : bar::an_int(3) {}	// { dg-error "match" "match" } not a base
-  // { dg-message "candidate" "candidate note" { target *-*-* } 14 }
   // { dg-message "expected" "exp" { target *-*-* } 14 }
 };