]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: Work around Boost.Containers bug in 1.91 68721/head
authorAdam C. Emerson <aemerson@redhat.com>
Fri, 1 May 2026 20:19:13 +0000 (16:19 -0400)
committerAdam C. Emerson <aemerson@redhat.com>
Sat, 9 May 2026 15:02:15 +0000 (11:02 -0400)
Since we're inserting from another `flat_set`, we can use
`ordered_unique_range`and sidestep the issue entirely and it's more
efficient.

https://github.com/boostorg/container/issues/334

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
src/rgw/rgw_zone.cc

index 77a88fd44c7fe61f7c1eedca67ec64dac9741413..6cb559bab57aa8d74fe693ca5adb75fc11eaf817 100644 (file)
@@ -977,7 +977,9 @@ int add_zone_to_group(const DoutPrefixProvider* dpp, RGWZoneGroup& zonegroup,
   }
 
   // add/remove supported features
-  zone.supported_features.insert(enable_features.begin(),
+  zone.supported_features.insert(boost::container::ordered_unique_range,
+                                 enable_features.begin(),
+
                                  enable_features.end());
 
   for (const auto& feature : disable_features) {