From f8aa18c08d97cdc98a85a0422d3415822a73949c Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Mon, 19 Mar 2012 21:04:52 +0000 Subject: Compile with c++0x. http://codereview.appspot.com/5841074/ git-svn-id: http://skia.googlecode.com/svn/trunk@3434 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests/PDFPrimitivesTest.cpp | 4 ++-- tests/ScalarTest.cpp | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'tests') diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp index f206062fa3..d1ed217c54 100644 --- a/tests/PDFPrimitivesTest.cpp +++ b/tests/PDFPrimitivesTest.cpp @@ -276,8 +276,8 @@ static void TestPDFPrimitives(skiatest::Reporter* reporter) { strlen(expectedResult), false, false); // Test that we correctly handle characters with the high-bit set. - char highBitCString[] = {0xDE, 0xAD, 'b', 'e', 0xEF, 0}; - SkRefPtr highBitName = new SkPDFName(highBitCString); + const unsigned char highBitCString[] = {0xDE, 0xAD, 'b', 'e', 0xEF, 0}; + SkRefPtr highBitName = new SkPDFName((const char*)highBitCString); highBitName->unref(); // SkRefPtr and new both took a reference. const char highBitExpectedResult[] = "/#DE#ADbe#EF"; CheckObjectOutput(reporter, highBitName.get(), highBitExpectedResult, diff --git a/tests/ScalarTest.cpp b/tests/ScalarTest.cpp index d2c05aba6f..981fb0f5f2 100644 --- a/tests/ScalarTest.cpp +++ b/tests/ScalarTest.cpp @@ -78,16 +78,16 @@ static void test_isfinite(skiatest::Reporter* reporter) { test_floatclass(reporter, -nan, kNaN); const Rec data[] = { - { 0, true }, - { 1, true }, - { -1, true }, - { max * 0.75, true }, - { max, true }, - { -max * 0.75, true }, - { -max, true }, - { inf, false }, - { -inf, false }, - { nan, false }, + { 0, true }, + { 1, true }, + { -1, true }, + { max * 0.75f, true }, + { max, true }, + { -max * 0.75f, true }, + { -max, true }, + { inf, false }, + { -inf, false }, + { nan, false }, }; const IsFiniteProc1 gProc1[] = { -- cgit v1.2.3