OSDN Git Service

Fix PR c++/45383
authordodji <dodji@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 29 Nov 2010 16:30:54 +0000 (16:30 +0000)
committerdodji <dodji@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 29 Nov 2010 16:30:54 +0000 (16:30 +0000)
commit9960d752f0bd2b1e3f0c62d50deae42a1303c8ce
treeac5e6bf206d5df6cf300a80924c9240f011cf8f5
parente231cc37f593b7526a22b293658f0500f69aa355
Fix PR c++/45383

Reverting the fix for PR c++/42260 fixes c++/45383.
This reverts commit r155415.

gcc/cp/
Reverted patch for PR c++/42260
* cp-tree.h (lookup_conversions): Reverted "Add new bool parameter to
declarationE."
* search.c (lookup_conversion): Reverted "Use new bool parameter in
definition".
* call.c (add_builtin_candidates): Reverted "Don't lookup template
          conversion"
(convert_class_to_reference, build_user_type_conversion_1,
 build_op_call): Reverted "Adjust".
* cvt.c (build_expr_type_conversion): Reverted "Likewise".

gcc/testsuite/
Reverted patch for PR c++/42260
* conversion/cast2.C: Reverted New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@167248 138bc75d-0d04-0410-961f-82ee72b054a4
gcc/cp/ChangeLog
gcc/cp/call.c
gcc/cp/cp-tree.h
gcc/cp/cvt.c
gcc/cp/search.c
gcc/testsuite/ChangeLog
gcc/testsuite/g++.dg/conversion/cast2.C [deleted file]