fixes for CI failures

google · Aug 28, 2022 · c90dc92 · c90dc92
1 parent 208d42e
commit c90dc92
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/tests/flexbuffers_test.cpp b/tests/flexbuffers_test.cpp
@@ -1,5 +1,6 @@
-#include "flatbuffers/flexbuffers.h"
+#include "flexbuffers_test.h"
 
+#include "flatbuffers/flexbuffers.h"
 #include "flatbuffers/idl.h"
 #include "is_quiet_nan.h"
 #include "test_assert.h"

diff --git a/tests/util_test.cpp b/tests/util_test.cpp
@@ -1,4 +1,5 @@
 #include "util_test.h"
+
 #include "flatbuffers/util.h"
 #include "test_assert.h"
 
@@ -31,7 +32,7 @@ void NumericUtilsTestFloat(const char *lower, const char *upper) {
   TEST_EQ(flatbuffers::StringToNumber(lower, &f), true);
   TEST_EQ(f, -flatbuffers::numeric_limits<T>::infinity());
 }
-}
+}  // namespace
 
 void NumericUtilsTest() {
   NumericUtilsTestInteger<uint64_t>("-1", "18446744073709551616");
@@ -59,8 +60,8 @@ void IsAsciiUtilsTest() {
 
 void UtilConvertCase() {
   {
-    std::vector<std::tuple<std::string, flatbuffers::Case, std::string>>
-        cases = {
+    std::vector<std::tuple<std::string, flatbuffers::Case, std::string>> cases =
+        std::vector<std::tuple<std::string, flatbuffers::Case, std::string>>{
           // Tests for the common cases
           { "the_quick_brown_fox", flatbuffers::Case::kUpperCamel,
             "TheQuickBrownFox" },
@@ -115,7 +116,8 @@ void UtilConvertCase() {
   {
     std::vector<std::tuple<flatbuffers::Case, std::string, flatbuffers::Case,
                            std::string>>
-        cases = {
+        cases = std::vector<std::tuple<flatbuffers::Case, std::string,
+                                       flatbuffers::Case, std::string>>{
           { flatbuffers::Case::kUpperCamel, "TheQuickBrownFox",
             flatbuffers::Case::kSnake, "the_quick_brown_fox" },
           { flatbuffers::Case::kLowerCamel, "theQuickBrownFox",
@@ -149,6 +151,5 @@ void UtilConvertCase() {
   }
 }
 
-
 }  // namespace tests
 }  // namespace flatbuffers