Compile with c++0x.
http://codereview.appspot.com/5841074/
git-svn-id: http://skia.googlecode.com/svn/trunk@3434 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp
index f206062..d1ed217 100644
--- a/tests/PDFPrimitivesTest.cpp
+++ b/tests/PDFPrimitivesTest.cpp
@@ -276,8 +276,8 @@
strlen(expectedResult), false, false);
// Test that we correctly handle characters with the high-bit set.
- char highBitCString[] = {0xDE, 0xAD, 'b', 'e', 0xEF, 0};
- SkRefPtr<SkPDFName> highBitName = new SkPDFName(highBitCString);
+ const unsigned char highBitCString[] = {0xDE, 0xAD, 'b', 'e', 0xEF, 0};
+ SkRefPtr<SkPDFName> 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 d2c05ab..981fb0f 100644
--- a/tests/ScalarTest.cpp
+++ b/tests/ScalarTest.cpp
@@ -78,16 +78,16 @@
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[] = {