summaryrefslogtreecommitdiff
path: root/libstdc++-v3/testsuite/tr1
diff options
context:
space:
mode:
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2014-05-14 16:47:54 +0000
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2014-05-14 16:47:54 +0000
commitaa8d51e468ef06c184290f20f1c3f875e0f5d266 (patch)
tree1a5c0bb3429211772bcc50bc832841a0edf52f96 /libstdc++-v3/testsuite/tr1
parenta8336256b0ecbea55a808296933b06464b258260 (diff)
downloadgcc-aa8d51e468ef06c184290f20f1c3f875e0f5d266.tar.gz
* 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210435 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/testsuite/tr1')
-rw-r--r--libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/auto_ptr_rvalue_neg.cc2
-rw-r--r--libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/modifiers/reset_neg.cc1
2 files changed, 2 insertions, 1 deletions
diff --git a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/auto_ptr_rvalue_neg.cc b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/auto_ptr_rvalue_neg.cc
index 662a985ea79..defafb3778d 100644
--- a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/auto_ptr_rvalue_neg.cc
+++ b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/auto_ptr_rvalue_neg.cc
@@ -34,7 +34,7 @@ test01()
bool test __attribute__((unused)) = true;
std::tr1::shared_ptr<A> a;
- a = source(); // { dg-error "no match" }
+ a = source(); // { dg-error "" }
return 0;
}
diff --git a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/modifiers/reset_neg.cc b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/modifiers/reset_neg.cc
index b3c5914f36b..26fc3d0c973 100644
--- a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/modifiers/reset_neg.cc
+++ b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/modifiers/reset_neg.cc
@@ -34,6 +34,7 @@ test01()
const std::tr1::shared_ptr<A> p1(new A);
p1.reset(); // { dg-error "discards qualifiers" }
+ // { dg-error "no match" "" { target *-*-* } 36 }
return 0;
}