PR c++/51079, DR 495

[gcc.git] / gcc / cp / ChangeLog

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 33bfa33403df96bc99f95d50f8931a1d674bcdf3..4492b3b62336fc467bdc889a85217ea5bd3a1c27 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-10  Jason Merrill  <jason@redhat.com>
+
+       PR c++/51079, DR 495
+       * call.c (joust): Check the second conversion sequence
+       before checking templates.
+
 2011-11-09  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/50837