[ci] fix additional ci errors

fangq · fangq · commit 2dce33d8b6ca · 2026-01-09T18:34:39.000-05:00
diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp
@@ -2880,6 +2880,20 @@ class binary_reader
                     return sax->number_unsigned(lex.get_number_unsigned());
                 case tt::value_float:
                     return sax->number_float(lex.get_number_float(), lex.get_token_string());
+                case tt::uninitialized:
+                case tt::literal_true:
+                case tt::literal_false:
+                case tt::literal_null:
+                case tt::value_string:
+                case tt::begin_array:
+                case tt::begin_object:
+                case tt::end_array:
+                case tt::end_object:
+                case tt::name_separator:
+                case tt::value_separator:
+                case tt::parse_error:
+                case tt::end_of_input:
+                case tt::literal_or_value:
                 default:
                     return sax->string(s);
             }
@@ -3154,7 +3168,7 @@ class binary_reader
                     {
                         return false;
                     }
-                    data.floats.push_back(v);
+                    data.floats.push_back(static_cast<double>(v));
                     return true;
                 }
 
@@ -3305,6 +3319,20 @@ class binary_reader
                             return sax->number_unsigned(lex.get_number_unsigned());
                         case tt::value_float:
                             return sax->number_float(lex.get_number_float(), lex.get_token_string());
+                        case tt::uninitialized:
+                        case tt::literal_true:
+                        case tt::literal_false:
+                        case tt::literal_null:
+                        case tt::value_string:
+                        case tt::begin_array:
+                        case tt::begin_object:
+                        case tt::end_array:
+                        case tt::end_object:
+                        case tt::name_separator:
+                        case tt::value_separator:
+                        case tt::parse_error:
+                        case tt::end_of_input:
+                        case tt::literal_or_value:
                         default:
                             return sax->string(data.strings[ri]);
                     }
diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp
@@ -1827,8 +1827,12 @@ class binary_writer
                 case value_t::string:
                     t = 0x53;  // 'S' - string type marker
                     break;
+                case value_t::object:
+                case value_t::array:
+                case value_t::binary:
+                case value_t::discarded:
                 default:
-                    // String, array, object, binary types not supported in basic SOA
+                    // Complex types not supported in basic SOA
                     return false;
             }
             schema.emplace_back(el.first, t);
@@ -1868,6 +1872,10 @@ class binary_writer
                     case value_t::string:
                         t = 0x53;  // 'S' - string type marker
                         break;
+                    case value_t::object:
+                    case value_t::array:
+                    case value_t::binary:
+                    case value_t::discarded:
                     default:
                         return false;
                 }
@@ -1937,7 +1945,7 @@ class binary_writer
         std::size_t offset_cost = arr.size() * off_size + (arr.size() + 1) * off_size + total_len;
 
         // Decision logic
-        if (unique_count <= static_cast<std::size_t>(arr.size() * thresh) &&
+        if (unique_count <= static_cast<std::size_t>(static_cast<double>(arr.size()) * thresh) &&
                 dict_cost < fixed_cost && dict_cost < offset_cost)
         {
             // Dictionary encoding
@@ -1998,7 +2006,7 @@ class binary_writer
 
             oa->write_character(to_char_type(0x5B));  // '['
             oa->write_character(to_char_type(0x24));  // '$'
-            oa->write_character(to_char_type(index_type));
+            oa->write_character(to_char_type(static_cast<std::uint8_t>(index_type)));
             oa->write_character(to_char_type(0x5D));  // ']'
         }
         else  // fixed
@@ -2020,7 +2028,7 @@ class binary_writer
         {
             // Write index
             auto it = std::find(field.str_dict.begin(), field.str_dict.end(), value);
-            std::size_t idx = std::distance(field.str_dict.begin(), it);
+            std::size_t idx = static_cast<std::size_t>(std::distance(field.str_dict.begin(), it));
 
             if (idx < 256)
             {
@@ -2138,7 +2146,7 @@ class binary_writer
             }
             else
             {
-                oa->write_character(to_char_type(f.second));
+                oa->write_character(to_char_type(static_cast<std::uint8_t>(f.second)));
             }
         }
 
diff --git a/tests/src/unit-bjdata.cpp b/tests/src/unit-bjdata.cpp

Original file line number	Diff line number	Diff line change
`@@ -1827,8 +1827,12 @@ class binary_writer`
`1827`	`1827`	`case value_t::string:`
`1828`	`1828`	`t = 0x53; // 'S' - string type marker`
`1829`	`1829`	`break;`
	`1830`	`+ case value_t::object:`
	`1831`	`+ case value_t::array:`
	`1832`	`+ case value_t::binary:`
	`1833`	`+ case value_t::discarded:`
`1830`	`1834`	`default:`
`1831`		`- // String, array, object, binary types not supported in basic SOA`
	`1835`	`+ // Complex types not supported in basic SOA`
`1832`	`1836`	`return false;`
`1833`	`1837`	`}`
`1834`	`1838`	`schema.emplace_back(el.first, t);`
`@@ -1868,6 +1872,10 @@ class binary_writer`
`1868`	`1872`	`case value_t::string:`
`1869`	`1873`	`t = 0x53; // 'S' - string type marker`
`1870`	`1874`	`break;`
	`1875`	`+ case value_t::object:`
	`1876`	`+ case value_t::array:`
	`1877`	`+ case value_t::binary:`
	`1878`	`+ case value_t::discarded:`
`1871`	`1879`	`default:`
`1872`	`1880`	`return false;`
`1873`	`1881`	`}`
`@@ -1937,7 +1945,7 @@ class binary_writer`
`1937`	`1945`	`std::size_t offset_cost = arr.size() * off_size + (arr.size() + 1) * off_size + total_len;`
`1938`	`1946`
`1939`	`1947`	`// Decision logic`
`1940`		`- if (unique_count <= static_cast<std::size_t>(arr.size() * thresh) &&`
	`1948`	`+ if (unique_count <= static_cast<std::size_t>(static_cast<double>(arr.size()) * thresh) &&`
`1941`	`1949`	`dict_cost < fixed_cost && dict_cost < offset_cost)`
`1942`	`1950`	`{`
`1943`	`1951`	`// Dictionary encoding`
`@@ -1998,7 +2006,7 @@ class binary_writer`
`1998`	`2006`
`1999`	`2007`	`oa->write_character(to_char_type(0x5B)); // '['`
`2000`	`2008`	`oa->write_character(to_char_type(0x24)); // '$'`
`2001`		`- oa->write_character(to_char_type(index_type));`
	`2009`	`+ oa->write_character(to_char_type(static_cast<std::uint8_t>(index_type)));`
`2002`	`2010`	`oa->write_character(to_char_type(0x5D)); // ']'`
`2003`	`2011`	`}`
`2004`	`2012`	`else // fixed`
`@@ -2020,7 +2028,7 @@ class binary_writer`
`2020`	`2028`	`{`
`2021`	`2029`	`// Write index`
`2022`	`2030`	`auto it = std::find(field.str_dict.begin(), field.str_dict.end(), value);`
`2023`		`- std::size_t idx = std::distance(field.str_dict.begin(), it);`
	`2031`	`+ std::size_t idx = static_cast<std::size_t>(std::distance(field.str_dict.begin(), it));`
`2024`	`2032`
`2025`	`2033`	`if (idx < 256)`
`2026`	`2034`	`{`
`@@ -2138,7 +2146,7 @@ class binary_writer`
`2138`	`2146`	`}`
`2139`	`2147`	`else`
`2140`	`2148`	`{`
`2141`		`- oa->write_character(to_char_type(f.second));`
	`2149`	`+ oa->write_character(to_char_type(static_cast<std::uint8_t>(f.second)));`
`2142`	`2150`	`}`
`2143`	`2151`	`}`
`2144`	`2152`