fix: update gtest and fix build error.

kitty-panics · Oct 30, 2022 · 7db668a · 7db668a
1 parent a56f578
commit 7db668a
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 9 deletions.
diff --git a/cpp/ext/redist/gtest-1.12.1.7z b/cpp/ext/redist/gtest-1.12.1.7z
diff --git a/cpp/ext/redist/gtest-1.6.0.zip b/cpp/ext/redist/gtest-1.6.0.zip
diff --git a/cpp/src/test/cmap_iterator_test.cc b/cpp/src/test/cmap_iterator_test.cc
@@ -149,8 +149,4 @@ INSTANTIATE_TEST_CASE_P(CMapIteratorTests,
                         ::testing::ValuesIn(kCMapIteratorTestsTestCases));
 }
 
-#else
-
-TEST(DummyTest, ValueParameterizedTestsAreNotSupportedOnThisPlatform) {}
-
 #endif  // GTEST_HAS_PARAM
diff --git a/cpp/src/test/cmap_test.cc b/cpp/src/test/cmap_test.cc
@@ -206,8 +206,4 @@ INSTANTIATE_TEST_CASE_P(CMapTests,
                         ::testing::ValuesIn(kCMapTestsTestCases));
 }
 
-#else
-
-TEST(DummyTest, ValueParameterizedTestsAreNotSupportedOnThisPlatform) {}
-
 #endif  // GTEST_HAS_PARAM
diff --git a/cpp/src/test/test_utils.cc b/cpp/src/test/test_utils.cc
@@ -50,7 +50,7 @@ int32_t TestUtils::EncodeOneChar(UConverter* encoder, int16_t uchar) {
   target_end = target;
   ucnv_fromUnicode(encoder, &target_end, target + 4,
                    (const UChar**)&source_end, source + sizeof(UChar),
-                   NULL, TRUE, &status);
+                   NULL, true, &status);
   if (!U_SUCCESS(status)) {
     fprintf(stderr, "Error occured in conversion of %d: %s\n",
             uchar, u_errorName(status));