cvt.c (cp_convert_to_pointer): Remove force parameter.
authorOllie Wild <aaw@google.com>
Fri, 31 Aug 2007 04:41:52 +0000 (04:41 +0000)
committerOllie Wild <aaw@gcc.gnu.org>
Fri, 31 Aug 2007 04:41:52 +0000 (04:41 +0000)
commit6e03b280b00030909b9b8204d6b151ad8060d77e
treeaf96dea76799906789882358f9345fac9ddcc51a
parent2710d6d70d29b63208de5a8234f1a90dc42c3404
cvt.c (cp_convert_to_pointer): Remove force parameter.

gcc/cp/
* cvt.c (cp_convert_to_pointer): Remove force parameter. Call
convert_ptrmem for pointer to member conversions.
(convert_to_pointer_force): Update cp_convert_to_pointer call.
(ocp_convert): Update cp_convert_to_pointer call.
* typeck.c (convert_ptrmem): Add conditional for null pointers to
members.
(build_static_cast_1): Check can_convert for conversions in either
direction.
(get_delta_difference_1): New function.
(get_delta_difference): Refactor to call get_delta_difference_1.

gcc/testsuite/
g++.dg/conversion/ptrmem2.C: New test.
g++.dg/conversion/ptrmem3.C: New test.
g++.dg/conversion/ptrmem4.C: New test.
g++.dg/conversion/ptrmem5.C: New test.
g++.dg/conversion/ptrmem6.C: New test.
g++.dg/conversion/ptrmem7.C: New test.
g++.dg/conversion/ptrmem8.C: New test.

From-SVN: r127953
gcc/cp/ChangeLog
gcc/cp/cvt.c
gcc/cp/typeck.c
gcc/testsuite/ChangeLog
gcc/testsuite/g++.dg/conversion/ptrmem2.C [new file with mode: 0644]
gcc/testsuite/g++.dg/conversion/ptrmem3.C [new file with mode: 0644]
gcc/testsuite/g++.dg/conversion/ptrmem4.C [new file with mode: 0644]
gcc/testsuite/g++.dg/conversion/ptrmem5.C [new file with mode: 0644]
gcc/testsuite/g++.dg/conversion/ptrmem6.C [new file with mode: 0644]
gcc/testsuite/g++.dg/conversion/ptrmem7.C [new file with mode: 0644]
gcc/testsuite/g++.dg/conversion/ptrmem8.C [new file with mode: 0644]