r199458 - in /branches/google/main: contrib/tes...

Thu May 30 19:36:00 GMT 2013

Author: dnovillo
Date: Thu May 30 19:36:34 2013
New Revision: 199458

URL: http://gcc.gnu.org/viewcvs?rev=199458&root=gcc&view=rev
Log:

Fix merge problems for testsuite/g++.dg/warn/Wconversion-null-2.C.
Use the original version from gcc-4_8-branch.

Remove the expected failure.

Modified:
    branches/google/main/contrib/testsuite-management/x86_64-grtev3-linux-gnu.xfail
    branches/google/main/gcc/testsuite/g++.dg/warn/Wconversion-null-2.C