Merge commit '2a2973183824e1ab35efd8f536491cdd7bd316ed' into develop

* commit '2a2973183824e1ab35efd8f536491cdd7bd316ed': Fix -Wsign-compare warnings in variant.hpp; also catches the case when `which` is negative
boostorg · Jun 8, 2024 · 38a3cd5 · 38a3cd5
2 parents d8e072a + 2a29731
commit 38a3cd5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/include/boost/serialization/variant.hpp b/include/boost/serialization/variant.hpp
@@ -216,7 +216,7 @@ void load(
     int which;
     typedef typename boost::variant<Types...>::types types;
     ar >> BOOST_SERIALIZATION_NVP(which);
-    if(which >=  sizeof...(Types)){
+    if(static_cast<std::size_t>(which) >= sizeof...(Types)){
         // this might happen if a type was removed from the list of variant types
         boost::serialization::throw_exception(
             boost::archive::archive_exception(
@@ -238,7 +238,7 @@ void load(
     int which;
     typedef typename boost::variant<Types...>::types types;
     ar >> BOOST_SERIALIZATION_NVP(which);
-    if(which >=  sizeof...(Types)){
+    if(static_cast<std::size_t>(which) >= sizeof...(Types)){
         // this might happen if a type was removed from the list of variant types
         boost::serialization::throw_exception(
             boost::archive::archive_exception(